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

Stephen Rothwell
2019-09-02T11:48:36Z

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

Hi all,

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

arch/riscv/Kconfig

between commit:

d95f1a542c3d ("RISC-V: Implement sparsemem")

from the risc-v tree and commit:

f6a9089b8915 ("riscv: make mmap allocation top-down by default")

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.

--
Cheers,
Stephen Rothwell

diff --cc arch/riscv/Kconfig
index 572599cbf750,87dc5370becb..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -56,7 -54,18 +56,19 @@@ config RISC
select EDAC_SUPPORT
select ARCH_HAS_GIGANTIC_PAGE
select ARCH_WANT_HUGE_PMD_SHARE if 64BIT
+ select SPARSEMEM_STATIC if 32BIT
+ select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
+ select HAVE_ARCH_MMAP_RND_BITS
+
+ config ARCH_MMAP_RND_BITS_MIN
+ default 18 if 64BIT
+ default 8
+
+ # max bits determined by the following formula:
+ # VA_BITS - PAGE_SHIFT - 3
+ config ARCH_MMAP_RND_BITS_MAX
+ default 24 if 64BIT # SV39 based
+ default 17

config MMU
def_bool y