linux-next: manual merge of the vfs tree with the sparc tree

[Stephen Rothwell]

Hi Al,

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

  arch/sparc/Kconfig

between commit:

  395102db441a ("sparc64: Use LOCKDEP_SMALL, not PROVE_LOCKING_SMALL")

from the sparc 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/sparc/Kconfig
index a59deaef21e5,b577dbff5efb..000000000000
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@@ -42,8 -42,7 +42,7 @@@ config SPAR
  	select OLD_SIGSUSPEND
  	select ARCH_HAS_SG_CHAIN
  	select CPU_NO_EFFICIENT_FFS
- 	select HAVE_ARCH_HARDENED_USERCOPY
 -	select PROVE_LOCKING_SMALL if PROVE_LOCKING
 +	select LOCKDEP_SMALL if LOCKDEP
  	select ARCH_WANT_RELAX_ORDER
  
  config SPARC32