linux-next: manual merge of the akpm-current tree with the risc-v tree

Stephen Rothwell
2021-06-01T06:28:05Z

[-- Attachment #1: Type: text/plain, Size: 1218 bytes --]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

arch/riscv/Kconfig

between commit:

7fa865f5640a ("riscv: TRANSPARENT_HUGEPAGE: depends on MMU")

from the risc-v tree and commit:

f36992ff3525 ("mm: generalize ZONE_[DMA|DMA32]")

from the akpm-current 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.

I did the minimal fixup, but really, these selects should remain sorted.
--
Cheers,
Stephen Rothwell

diff --cc arch/riscv/Kconfig
index 2eedaf621bc7,6ee11ca998b2..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -106,7 -104,7 +106,8 @@@ config RISC
select SYSCTL_EXCEPTION_TRACE
select THREAD_INFO_IN_TASK
select UACCESS_MEMCPY if !MMU
+ select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT && MMU
+ select ZONE_DMA32 if 64BIT

config ARCH_MMAP_RND_BITS_MIN
default 18 if 64BIT