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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 8 Feb 2017 12:41:06 +1100

Hi Kees,

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

  include/asm-generic/asm-prototypes.h

between commit:

  c7858bf16c0b ("asm-prototypes: Clear any CPP defines before declaring the functions")

from Linus' tree and commit:

  e89c98504d89 ("initify: Mark functions with the __nocapture attribute")

from the kspp 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 include/asm-generic/asm-prototypes.h
index 939869c772b1,ea784e02b28e..000000000000
--- a/include/asm-generic/asm-prototypes.h
+++ b/include/asm-generic/asm-prototypes.h
@@@ -1,13 -1,7 +1,13 @@@
  #include <linux/bitops.h>
 +#undef __memset
  extern void *__memset(void *, int, __kernel_size_t);
 +#undef __memcpy
- extern void *__memcpy(void *, const void *, __kernel_size_t);
+ extern void *__memcpy(void *, const void *, __kernel_size_t) __nocapture(2);
 +#undef __memmove
- extern void *__memmove(void *, const void *, __kernel_size_t);
+ extern void *__memmove(void *, const void *, __kernel_size_t) __nocapture(2);
 +#undef memset
  extern void *memset(void *, int, __kernel_size_t);
 +#undef memcpy
- extern void *memcpy(void *, const void *, __kernel_size_t);
+ extern void *memcpy(void *, const void *, __kernel_size_t) __nocapture(2);
 +#undef memmove
- extern void *memmove(void *, const void *, __kernel_size_t);
+ extern void *memmove(void *, const void *, __kernel_size_t) __nocapture(2);