diff mbox series

linux-next: manual merge of the pci tree with the powerpc tree

Message ID 20191125093907.45e3421b@canb.auug.org.au (mailing list archive)
State Not Applicable
Headers show
Series linux-next: manual merge of the pci tree with the powerpc tree | expand

Checks

Context Check Description
snowpatch_ozlabs/apply_patch warning Failed to apply on branch powerpc/merge (f5b8031d0193757ee977b2cee25065a4e6200615)
snowpatch_ozlabs/apply_patch warning Failed to apply on branch powerpc/next (bf9c95e23324cbaf2e58fc3f0cbdc73137f2d1ca)
snowpatch_ozlabs/apply_patch warning Failed to apply on branch linus/master (6b8a794678763130b7e7d049985008641dc494e8)
snowpatch_ozlabs/apply_patch warning Failed to apply on branch powerpc/fixes (7d6475051fb3d9339c5c760ed9883bc0a9048b21)
snowpatch_ozlabs/apply_patch warning Failed to apply on branch linux-next (b9d3d01405061bb42358fe53f824e894a1922ced)
snowpatch_ozlabs/apply_patch fail Failed to apply to any branch

Commit Message

Stephen Rothwell Nov. 24, 2019, 10:39 p.m. UTC 
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.
diff mbox series

Patch

diff --cc arch/powerpc/include/asm/Kbuild
index 148bee20e7e2,17726f2e46de..000000000000
--- a/arch/powerpc/include/asm/Kbuild