Subject: linux-next: manual merge of the akpm-current tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 20 Jul 2015 13:54:39 +1000

Hi Andrew,

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

  arch/x86/Kconfig

between commit:

  5aaeb5c01c5b ("x86/fpu, sched: Introduce CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT and use it on x86")

from Linus' tree and commit:

  caf50fadb4de ("mm: send one IPI per CPU to TLB flush all entries after unmapping pages")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/x86/Kconfig
index 6c80c03d8e90,d9a83b54d86a..000000000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -41,7 -41,7 +41,8 @@@ config X8
  	select ARCH_USE_CMPXCHG_LOCKREF		if X86_64
  	select ARCH_USE_QUEUED_RWLOCKS
  	select ARCH_USE_QUEUED_SPINLOCKS
 +	select ARCH_WANTS_DYNAMIC_TASK_STRUCT
+ 	select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH if SMP
  	select ARCH_WANT_FRAME_POINTERS
  	select ARCH_WANT_IPC_PARSE_VERSION	if X86_32
  	select ARCH_WANT_OPTIONAL_GPIOLIB