* linux-next: manual merge of the acpi tree with the pci tree
@ 2009-11-26 2:22 Stephen Rothwell
2009-11-30 22:26 ` Bjorn Helgaas
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2009-11-26 2:22 UTC (permalink / raw)
To: Len Brown
Cc: linux-next, linux-kernel, Lin Ming, Bob Moore, Bjorn Helgaas,
Jesse Barnes
[-- Attachment #1: Type: text/plain, Size: 655 bytes --]
Hi Len,
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the acpi tree with the pci tree
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
2009-12-01 20:40 ` Bjorn Helgaas
0 siblings, 1 reply; 4+ messages in thread
From: Bjorn Helgaas @ 2009-11-30 22:26 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Len Brown, linux-next, linux-kernel, Lin Ming, Bob Moore,
Jesse Barnes
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the acpi tree with the pci tree
2009-11-30 22:26 ` Bjorn Helgaas
@ 2009-12-01 20:40 ` Bjorn Helgaas
2009-12-02 4:01 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Bjorn Helgaas @ 2009-12-01 20:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Len Brown, linux-next, linux-kernel, Lin Ming, Bob Moore,
Jesse Barnes
On Monday 30 November 2009 03:26:05 pm Bjorn Helgaas wrote:
> 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.
Has this been resolved already? Is there anything I can do to help?
Bjorn
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the acpi tree with the pci tree
2009-12-01 20:40 ` Bjorn Helgaas
@ 2009-12-02 4:01 ` Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2009-12-02 4:01 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Len Brown, linux-next, linux-kernel, Lin Ming, Bob Moore,
Jesse Barnes
[-- Attachment #1: Type: text/plain, Size: 1908 bytes --]
Hi Bjorn,
On Tue, 1 Dec 2009 13:40:19 -0700 Bjorn Helgaas <bjorn.helgaas@hp•com> wrote:
>
> On Monday 30 November 2009 03:26:05 pm Bjorn Helgaas wrote:
> > 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.
>
> Has this been resolved already? Is there anything I can do to help?
I have a merge resolution in linux-next. The resolution (simple as it
is) can just wait until the second of these two trees is merged into
Linus' tree (or the second tree could be fixed up my merging Linus' tree
after the first of the above trees is merged).
So currently, there is nothing to be done, I think, thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-12-02 4:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2009-12-01 20:40 ` Bjorn Helgaas
2009-12-02 4:01 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox