Subject: linux-next: manual merge of the vfs tree with the mips tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 12 Apr 2017 09:39:01 +1000

Hi all,

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

  arch/mips/Kconfig

between commit:

  3c81d1369703 ("MIPS: Opt into HAVE_COPY_THREAD_TLS")

from the mips tree and commit:

  28fa21828dbd ("HAVE_ARCH_HARDENED_USERCOPY is unconditional now")

from the vfs 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/mips/Kconfig
index 52d81ca6f74e,81ce5b4b9251..000000000000
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -69,8 -68,6 +69,7 @@@ config MIP
  	select HANDLE_DOMAIN_IRQ
  	select HAVE_EXIT_THREAD
  	select HAVE_REGS_AND_STACK_ACCESS_API
- 	select HAVE_ARCH_HARDENED_USERCOPY
 +	select HAVE_COPY_THREAD_TLS
  
  menu "Machine selection"