Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
arch/x86/um/Kconfig
between commit:
b62a8486de3a ("elfcore: Replace CONFIG_{IA64, UML} checks with a new option")
from the arm64 tree and commit:
6692531df62d ("uml/x86: use x86 load_unaligned_zeropad()")
from the vfs 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/x86/um/Kconfig
index ead7e5b3a975,4eb47d3ba625..000000000000
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@@ -8,7 -8,7 +8,8 @@@ endmen
config UML_X86
def_bool y
+ select ARCH_BINFMT_ELF_EXTRA_PHDRS if X86_32
+ select DCACHE_WORD_ACCESS
config 64BIT
bool "64-bit kernel" if "$(SUBARCH)" = "x86"
Attachment:
pgpInOO8w1Xfb.pgp
Description: OpenPGP digital signature
