From: Bjorn Helgaas <bjorn.helgaas@hp•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Len Brown <lenb@kernel•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Lin Ming <ming.m.lin@intel•com>,
Bob Moore <robert.moore@intel•com>,
Jesse Barnes <jbarnes@virtuousgeek•org>
Subject: Re: linux-next: manual merge of the acpi tree with the pci tree
Date: Mon, 30 Nov 2009 15:26:05 -0700 [thread overview]
Message-ID: <200911301526.07220.bjorn.helgaas@hp.com> (raw)
In-Reply-To: <20091126132228.85a63dee.sfr@canb.auug.org.au>
On Wednesday 25 November 2009 07:22:28 pm Stephen Rothwell wrote:
> Today's linux-next merge of the acpi tree got a conflict in
> drivers/pci/hotplug/acpiphp_glue.c between commit
> 204d49a5613a06eb2fa5c3b842a29b1336cc7995 ("PCI hotplug: move IOAPIC
> support from acpiphp to ioapic driver") from the pci tree and commit
> 2263576cfc6e8f6ab038126c3254404b9fcb1c33 ("ACPICA: Add post-order
> callback to acpi_walk_namespace") from the acpi tree.
>
> The former moved part of the code modified by the latter into another
> file. All the calls to acpi_walk_namespace() seem to have been removed
> in this process.
I was on vacation last week, so couldn't respond earlier, sorry.
As you noticed, 204d49a56 removed some acpi_walk_namespace() calls.
It removed calls to the old "pre-order only" version, while 263576cfc
converted acpi_walk_namespace() to a new "pre-order and post-order"
version.
This is conceptually simple because 204d49a56 is just removing uses
of acpi_walk_namespace(), so we don't care at all whether it removes
calls to the old or new version. But I don't have enough git-fu to
know how to fix this.
Bjorn
next prev parent reply other threads:[~2009-11-30 22:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-26 2:22 linux-next: manual merge of the acpi tree with the pci tree Stephen Rothwell
2009-11-30 22:26 ` Bjorn Helgaas [this message]
2009-12-01 20:40 ` Bjorn Helgaas
2009-12-02 4:01 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200911301526.07220.bjorn.helgaas@hp.com \
--to=bjorn.helgaas@hp$(echo .)com \
--cc=jbarnes@virtuousgeek$(echo .)org \
--cc=lenb@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ming.m.lin@intel$(echo .)com \
--cc=robert.moore@intel$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox