Messages in this thread | | | Date | Thu, 17 Sep 2009 01:20:35 +1000 | From | Stephen Rothwell <> | Subject | Re: [git pull] first round of PCI updates for 2.6.32 |
| |
Hi Linus,
On Wed, 16 Sep 2009 07:55:59 -0700 (PDT) Linus Torvalds <torvalds@linux-foundation.org> wrote: > > This one clashed trivially with the powerpc merge ("move pci_64.c device > tree scanning code into pci-common.c" clashes with "PCI/powerpc: support > PCIe fundamental reset.") > > I fixed it up, and I'm pretty sure it's all ok (it really was just a > function movement and a single new added line), but ppc PCI people should > double-check the result.
It looks good and matches the fix I have been carrying in linux-next for some time. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |