linux-next: manual merge of the akpm tree with the arm64 tree

[Stephen Rothwell]

Hi all,

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

  arch/arm64/Kconfig

between commit:

  983460233659 ("arm64: Kconfig: select HAVE_FUTEX_CMPXCHG")

from the arm64 tree and commit:

  2a6e68c2d781 ("asm-generic/tlb: rename HAVE_RCU_TABLE_FREE")

from the akpm 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/arm64/Kconfig
index 21de6ffc3652,c050d2393610..000000000000
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -164,8 -164,7 +164,8 @@@ config ARM6
  	select HAVE_PERF_USER_STACK_DUMP
  	select HAVE_REGS_AND_STACK_ACCESS_API
  	select HAVE_FUNCTION_ARG_ACCESS_API
 +	select HAVE_FUTEX_CMPXCHG if FUTEX
- 	select HAVE_RCU_TABLE_FREE
+ 	select MMU_GATHER_RCU_TABLE_FREE
  	select HAVE_RSEQ
  	select HAVE_STACKPROTECTOR
  	select HAVE_SYSCALL_TRACEPOINTS

Attachment: pgpxl1EGH5m5H.pgp
Description: OpenPGP digital signature