Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/s390/Kconfig
between commit:
7e6ebd8ee418 ("mm/vmemmap optimization: split hugetlb and devdax vmemmap optimization")
from the mm-stable tree and commit:
2f0584f3f4bd ("mm: Rename arch pte_mkwrite()'s to pte_mkwrite_novma()")
from the tip 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/s390/Kconfig
index 661b6de69c27,91514d535c46..000000000000
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -127,7 -127,8 +127,8 @@@ config S39
select ARCH_WANTS_NO_INSTR
select ARCH_WANT_DEFAULT_BPF_JIT
select ARCH_WANT_IPC_PARSE_VERSION
- select ARCH_WANT_OPTIMIZE_VMEMMAP
+ select ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP
+ select ARCH_WANT_KERNEL_PMD_MKWRITE
select BUILDTIME_TABLE_SORT
select CLONE_BACKWARDS2
select DMA_OPS if PCI
Attachment:
pgpRapXhSTKGg.pgp
Description: OpenPGP digital signature
