Hi Jesse, Today's linux-next merge of the pci tree got a conflicts in arch/x86/kernel/resource.c arch/x86/pci/i386.c kernel/resource.c between various commits from Linus' tree and similar commits from the pci tree. I just used the versions from Linus' tree and assume that the pci tree needs to be resynced. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpp9jo0nzE2D.pgp
Description: PGP signature
