Re: [git pull] first round of PCI updates for 2.6.32

[Linus Torvalds]

On Tue, 15 Sep 2009, Jesse Barnes wrote:
>
> The following changes since commit 332a3392188e0ad966543c87b8da2b9d246f301d:
>   Linus Torvalds (1):
>         Merge git://git.kernel.org/.../herbert/crypto-2.6
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 linux-next
> 
> There are a few important changes in here:
>   - support for PCIe fundamental reset from Mike (needed for error recovery on
>     some devices)

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.

		Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/