linux-next: manual merge of the akpm-current tree with the kspp tree

[Stephen Rothwell]

Hi all,

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

  mm/Kconfig

between commit:

  2792d84e6da5 ("usercopy: Check valid lifetime via stack depth")

from the kspp tree and commit:

  29c91f123969 ("mm: generalize ARCH_HAS_FILTER_PGPROT")

from the akpm-current 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 mm/Kconfig
index 4b7663a91f18,67998bd3352e..000000000000
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@@ -747,15 -750,9 +753,18 @@@ config IDLE_PAGE_TRACKIN
  config ARCH_HAS_CACHE_LINE_SIZE
  	bool
  
 +config ARCH_HAS_CURRENT_STACK_POINTER
 +	bool
 +	help
 +	  In support of HARDENED_USERCOPY performing stack variable lifetime
 +	  checking, an architecture-agnostic way to find the stack pointer
 +	  is needed. Once an architecture defines an unsigned long global
 +	  register alias named "current_stack_pointer", this config can be
 +	  selected.
 +
+ config ARCH_HAS_FILTER_PGPROT
+ 	bool
+ 
  config ARCH_HAS_PTE_DEVMAP
  	bool

Attachment: pgpRw0KhD7srO.pgp
Description: OpenPGP digital signature