Merge tag 'gcc-plugins-v4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Dec 2016 17:22:21 +0000 (09:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Dec 2016 17:22:21 +0000 (09:22 -0800)
commit22d8262c33e52b10a4c442b04a2388b4bc589ee4
tree8dc69572f222d67dc023eca42e48323842058c55
parent52281b38bc28e188a8aad17c3bf200e670a37aba
parent215e2aa6c024d27cdbe88e2ea88cb59dcab588eb
Merge tag 'gcc-plugins-v4.10-rc1' of git://git./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
MAINTAINERS
arch/Kconfig