Hi Benjamin,
Today's linux-next merge of the of-pci tree got a conflict in
arch/microblaze/include/asm/pci-bridge.h between commit f4ffd5e5dfda
("pci: move microblaze and powerpc pci flag functions into asm-generic")
from the arm-soc tree and commit 72bdee79f89f ("microblaze/pci: Remove
powermac originated cruft") from the of-pci tree.
The former removal removed a superset of what the latter removed, so I
used the former.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpFQRKdZ010I.pgp
Description: PGP signature
