diff mbox series

linux-next: manual merge of the arm-soc tree with the arm tree

Message ID 20220228111613.1e299554@canb.auug.org.au (mailing list archive)
State New, archived
Headers show
Series linux-next: manual merge of the arm-soc tree with the arm tree | expand

Commit Message

Stephen Rothwell Feb. 28, 2022, 12:16 a.m. UTC 
Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in:

  arch/arm/Kconfig

between commit:

  54f481a2308e ("ARM: remove old-style irq entry")

from the arm tree and commit:

  00ba9357d189 ("ARM: ixp4xx: Drop custom DMA coherency and bouncing")

from the arm-soc 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/arm/Kconfig
index 72150cb8db02,d9142ad18c52..000000000000
--- a/arch/arm/Kconfig