Subject: linux-next: manual merge of the s390 tree with the compiler-attributes tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 9 Oct 2018 10:13:16 +1100

Hi all,

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

  include/linux/compiler-gcc.h

between commits:

  5c67a52f3da0 ("Compiler Attributes: always use the extra-underscores syntax")
  a3f8a30f3f00 ("Compiler Attributes: use feature checks instead of version checks")

from the compiler-attributes tree and commit:

  65bdf3bbf56e ("compiler: introduce __no_sanitize_address_or_inline")

from the s390 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/linux/compiler-gcc.h
index cfac027e1625,997ade08a79d..000000000000
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@@ -147,7 -201,27 +147,14 @@@
  #define KASAN_ABI_VERSION 3
  #endif
  
 -#if GCC_VERSION >= 40902
 -/*
 - * Tell the compiler that address safety instrumentation (KASAN)
 - * should not be applied to that function.
 - * Conflicts with inlining: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368
 - */
 -#define __no_sanitize_address __attribute__((no_sanitize_address))
 -#ifdef CONFIG_KASAN
++#if (GCC_VERSION >= 40902) && defined(CONFIG_KASAN)
+ #define __no_sanitize_address_or_inline					\
+ 	__no_sanitize_address __maybe_unused notrace
+ #else
+ #define __no_sanitize_address_or_inline inline
+ #endif
 -#endif
+ 
  #if GCC_VERSION >= 50100
 -/*
 - * Mark structures as requiring designated initializers.
 - * https://gcc.gnu.org/onlinedocs/gcc/Designated-Inits.html
 - */
 -#define __designated_init __attribute__((designated_init))
  #define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
  #endif