linux-next: manual merge of the risc-v tree with Linus' tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

Today's linux-next merge of the risc-v tree got a conflict in:

  arch/riscv/Kconfig

between commits:

  42e0e0b453bc ("riscv: code patching only works on !XIP_KERNEL")
  63703f37aa09 ("mm: generalize ZONE_[DMA|DMA32]")

from Linus' tree and commits:

  e88b333142e4 ("riscv: mm: add THP support on 64-bit")
  3332f4190674 ("riscv: mremap speedup - enable HAVE_MOVE_PUD and HAVE_MOVE_PMD")
  7fa865f5640a ("riscv: TRANSPARENT_HUGEPAGE: depends on MMU")
  47513f243b45 ("riscv: Enable KFENCE for riscv64")

from the risc-v 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.

N.B. The new select of HAVE_ARCH_TRANSPARENT_HUGEPAGE is out of order :-(

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/Kconfig
index 469a70bd8da6,7304278dbbe9..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -61,11 -60,12 +61,12 @@@ config RISC
  	select GENERIC_TIME_VSYSCALL if MMU && 64BIT
  	select HANDLE_DOMAIN_IRQ
  	select HAVE_ARCH_AUDITSYSCALL
 -	select HAVE_ARCH_JUMP_LABEL
 -	select HAVE_ARCH_JUMP_LABEL_RELATIVE
 +	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
 +	select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL
  	select HAVE_ARCH_KASAN if MMU && 64BIT
  	select HAVE_ARCH_KASAN_VMALLOC if MMU && 64BIT
+ 	select HAVE_ARCH_KFENCE if MMU && 64BIT
 -	select HAVE_ARCH_KGDB
 +	select HAVE_ARCH_KGDB if !XIP_KERNEL
  	select HAVE_ARCH_KGDB_QXFER_PKT
  	select HAVE_ARCH_MMAP_RND_BITS if MMU
  	select HAVE_ARCH_SECCOMP_FILTER
@@@ -80,9 -80,11 +81,11 @@@
  	select HAVE_GCC_PLUGINS
  	select HAVE_GENERIC_VDSO if MMU && 64BIT
  	select HAVE_IRQ_TIME_ACCOUNTING
 -	select HAVE_KPROBES
 -	select HAVE_KPROBES_ON_FTRACE
 -	select HAVE_KRETPROBES
 +	select HAVE_KPROBES if !XIP_KERNEL
 +	select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL
 +	select HAVE_KRETPROBES if !XIP_KERNEL
+ 	select HAVE_MOVE_PMD
+ 	select HAVE_MOVE_PUD
  	select HAVE_PCI
  	select HAVE_PERF_EVENTS
  	select HAVE_PERF_REGS
@@@ -104,7 -106,7 +107,8 @@@
  	select SYSCTL_EXCEPTION_TRACE
  	select THREAD_INFO_IN_TASK
  	select UACCESS_MEMCPY if !MMU
 +	select ZONE_DMA32 if 64BIT
+ 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT && MMU
  
  config ARCH_MMAP_RND_BITS_MIN
  	default 18 if 64BIT

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]