Messages in this thread | | | Date | Mon, 25 Nov 2019 09:39:07 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the pci tree with the powerpc tree |
| |
Hi all,
Today's linux-next merge of the pci tree got a conflict in:
arch/powerpc/include/asm/Kbuild
between commit:
265c3491c4bc ("powerpc: Add support for GENERIC_EARLY_IOREMAP")
from the powerpc tree and commit:
356f42aff121 ("asm-generic: Make msi.h a mandatory include/asm header")
from the pci tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
-- Cheers, Stephen Rothwell
diff --cc arch/powerpc/include/asm/Kbuild index 148bee20e7e2,17726f2e46de..000000000000 --- a/arch/powerpc/include/asm/Kbuild +++ b/arch/powerpc/include/asm/Kbuild @@@ -11,5 -10,3 +11,4 @@@ generic-y += local64. generic-y += mcs_spinlock.h generic-y += preempt.h generic-y += vtime.h - generic-y += msi.h +generic-y += early_ioremap.h [unhandled content-type:application/pgp-signature] | |