linux-next: manual merge of the compiler-attributes tree with Linus' tree

linux-next: manual merge of the compiler-attributes tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1733 bytes --]

Hi all,

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

  include/linux/compiler_attributes.h

between commit:

  ae4d682dfd33 ("compiler_attributes.h: cleanups for GCC 4.9+")

from Linus' tree and commit:

  7ed012969bbc ("Compiler Attributes: fix __has_attribute(__no_sanitize_coverage__) for GCC 4")

from the compiler-attributes 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_attributes.h
index 2487be0e7199,7b1fa5c30169..000000000000
--- a/include/linux/compiler_attributes.h
+++ b/include/linux/compiler_attributes.h
@@@ -33,10 -33,10 +33,11 @@@
  # define __GCC4_has_attribute___externally_visible__  1
  # define __GCC4_has_attribute___no_caller_saved_registers__ 0
  # define __GCC4_has_attribute___noclone__             1
 +# define __GCC4_has_attribute___no_profile_instrument_function__ 0
  # define __GCC4_has_attribute___nonstring__           0
 -# define __GCC4_has_attribute___no_sanitize_address__ (__GNUC_MINOR__ >= 8)
 -# define __GCC4_has_attribute___no_sanitize_undefined__ (__GNUC_MINOR__ >= 9)
 +# define __GCC4_has_attribute___no_sanitize_address__ 1
 +# define __GCC4_has_attribute___no_sanitize_undefined__ 1
+ # define __GCC4_has_attribute___no_sanitize_coverage__ 0
  # define __GCC4_has_attribute___fallthrough__         0
  #endif
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]