summary refs log tree commit diff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-13 09:22:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-13 09:22:21 -0800
commit22d8262c33e52b10a4c442b04a2388b4bc589ee4 (patch)
tree8dc69572f222d67dc023eca42e48323842058c55 /MAINTAINERS
parent52281b38bc28e188a8aad17c3bf200e670a37aba (diff)
parent215e2aa6c024d27cdbe88e2ea88cb59dcab588eb (diff)
downloadlinux-22d8262c33e52b10a4c442b04a2388b4bc589ee4.tar.gz
Merge tag 'gcc-plugins-v4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull gcc plugins updates from Kees Cook:
 "Minor changes to the gcc plugins:

   - add the gcc plugins Makefile to MAINTAINERS to route things
     correctly

   - hide cyc_complexity behind !CONFIG_TEST for the future unhiding of
     plugins generally"

* tag 'gcc-plugins-v4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  gcc-plugins: Adjust Kconfig to avoid cyc_complexity
  MAINTAINERS: add GCC plugins Makefile
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c97a29527a21..fde08b1b5b7f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5239,6 +5239,7 @@ L:	kernel-hardening@lists.openwall.com
 S:	Maintained
 F:	scripts/gcc-plugins/
 F:	scripts/gcc-plugin.sh
+F:	scripts/Makefile.gcc-plugins
 F:	Documentation/gcc-plugins.txt
 
 GCOV BASED KERNEL PROFILING