* linux-next: manual merge of the sparc tree with Linus' tree
@ 2021-02-21 20:56 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2021-02-21 20:56 UTC (permalink / raw)
To: David Miller
Cc: Al Viro, Linux Kernel Mailing List, Linux Next Mailing List,
Randy Dunlap
[-- Attachment #1: Type: text/plain, Size: 747 bytes --]
Hi all,
Today's linux-next merge of the sparc tree got a conflict in:
arch/sparc/Kconfig
between commit:
41026c343540 ("Kconfig: regularize selection of CONFIG_BINFMT_ELF")
from Linus' tree and commit:
80bddf5c93a9 ("sparc64: only select COMPAT_BINFMT_ELF if BINFMT_ELF is set")
from the sparc tree.
I fixed it up (I used the former) 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:[~2021-02-21 20:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-21 20:56 linux-next: manual merge of the sparc tree with Linus' 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.