* linux-next: manual merge of the m68knommu tree with the m68k-current tree
@ 2019-07-09 23:30 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2019-07-09 23:30 UTC (permalink / raw)
To: Greg Ungerer, Geert Uytterhoeven
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Christoph Hellwig
[-- Attachment #1: Type: text/plain, Size: 764 bytes --]
Hi all,
Today's linux-next merge of the m68knommu tree got a conflict in:
arch/m68k/Kconfig
between commit:
f28a1f16135c ("m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire")
from the m68k-current tree and commit:
aef0f78e7460 ("binfmt_flat: add a ARCH_HAS_BINFMT_FLAT option")
from the m68knommu 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-07-09 23:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-09 23:30 linux-next: manual merge of the m68knommu tree with the m68k-current tree Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.