Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kbuild updates from Michal Marek:

 - GCC plugin support by Emese Revfy from grsecurity, with a fixup from
   Kees Cook.  The plugins are meant to be used for static analysis of
   the kernel code.  Two plugins are provided already.

 - reduction of the gcc commandline by Arnd Bergmann.

 - IS_ENABLED / IS_REACHABLE macro enhancements by Masahiro Yamada

 - bin2c fix by Michael Tautschnig

 - setlocalversion fix by Wolfram Sang

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  gcc-plugins: disable under COMPILE_TEST
  kbuild: Abort build on bad stack protector flag
  scripts: Fix size mismatch of kexec_purgatory_size
  kbuild: make samples depend on headers_install
  Kbuild: don't add obj tree in additional includes
  Kbuild: arch: look for generated headers in obtree
  Kbuild: always prefix objtree in LINUXINCLUDE
  Kbuild: avoid duplicate include path
  Kbuild: don't add ../../ to include path
  vmlinux.lds.h: replace config_enabled() with IS_ENABLED()
  kconfig.h: allow to use IS_{ENABLE,REACHABLE} in macro expansion
  kconfig.h: use already defined macros for IS_REACHABLE() define
  export.h: use __is_defined() to check if __KSYM_* is defined
  kconfig.h: use __is_defined() to check if MODULE is defined
  kbuild: setlocalversion: print error to STDERR
  Add sancov plugin
  Add Cyclomatic complexity GCC plugin
  GCC plugin infrastructure
  Shared library support

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
index 393b6159ae924c0758fc4443c85f50b88917fcb2,08aac0a7c85f71af81f5d93a0fe2f8efa40b012c..d6d401bf9d95349834d8b73ae1e7f26d9137dbda
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -369,9 -368,8 +369,9 @@@ AFLAGS_MODULE   
  LDFLAGS_MODULE  =
  CFLAGS_KERNEL =
  AFLAGS_KERNEL =
 -CFLAGS_GCOV   = -fprofile-arcs -ftest-coverage -fno-tree-loop-im -Wno-maybe-uninitialized
 +LDFLAGS_vmlinux =
 +CFLAGS_GCOV   = -fprofile-arcs -ftest-coverage -fno-tree-loop-im
- CFLAGS_KCOV   = -fsanitize-coverage=trace-pc
+ CFLAGS_KCOV   := $(call cc-option,-fsanitize-coverage=trace-pc,)
  
  
  # Use USERINCLUDE when you must reference the UAPI directories only.

diff --cc arch/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/powerpc/boot/Makefile
Simple merge

diff --cc arch/s390/boot/compressed/Makefile
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/boot/Makefile
Simple merge

diff --cc arch/x86/entry/vdso/Makefile
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

diff --cc lib/Kconfig.debug
Simple merge