Merge tag 'compiler-attributes-for-linus-v5.15-rc1-v2' of git://github.com/ojeda...

Pull compiler attributes updates from Miguel Ojeda:

 - Fix __has_attribute(__no_sanitize_coverage__) for GCC 4 (Marco Elver)

 - Add Nick as Reviewer for compiler_attributes.h (Nick Desaulniers)

 - Move __compiletime_{error|warning} (Nick Desaulniers)

* tag 'compiler-attributes-for-linus-v5.15-rc1-v2' of git://github.com/ojeda/linux:
  compiler_attributes.h: move __compiletime_{error|warning}
  MAINTAINERS: add Nick as Reviewer for compiler_attributes.h
  Compiler Attributes: fix __has_attribute(__no_sanitize_coverage__) for GCC 4

diff --cc MAINTAINERS
Simple merge

diff --cc include/linux/compiler-gcc.h
Simple merge

diff --cc include/linux/compiler_attributes.h
index 2487be0,f4df9e5..8f2106e
--- 1/include/linux/compiler_attributes.h
--- 2/include/linux/compiler_attributes.h
+++ b/include/linux/compiler_attributes.h
@@@ -27,17 -27,19 +27,20 @@@
   */
  #ifndef __has_attribute
  # define __has_attribute(x) __GCC4_has_attribute_##x
 -# define __GCC4_has_attribute___assume_aligned__      (__GNUC_MINOR__ >= 9)
 +# define __GCC4_has_attribute___assume_aligned__      1
  # define __GCC4_has_attribute___copy__                0
  # define __GCC4_has_attribute___designated_init__     0
+ # define __GCC4_has_attribute___error__               1
  # 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
+ # define __GCC4_has_attribute___warning__             1
  #endif
  
  /*

diff --cc include/linux/compiler_types.h
Simple merge