Merge tag 'rodata-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Feb 2017 01:56:45 +0000 (17:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Feb 2017 01:56:45 +0000 (17:56 -0800)
commit7bb033829ef3ecfc491c0ed0197966e8f197fbdc
tree9bf410d9726a351970e83bf5f189b5f10035d6f6
parent4a0853bf88c8f56e1c01eda02e6625aed09d55d9
parent0f5bf6d0afe4be6e1391908ff2d6dc9730e91550
Merge tag 'rodata-v4.11-rc1' of git://git./linux/kernel/git/kees/linux

Pull rodata updates from Kees Cook:
 "This renames the (now inaccurate) DEBUG_RODATA and related
  SET_MODULE_RONX configs to the more sensible STRICT_KERNEL_RWX and
  STRICT_MODULE_RWX"

* tag 'rodata-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  arch: Rename CONFIG_DEBUG_RODATA and CONFIG_DEBUG_MODULE_RONX
  arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to be common
arch/arm/Kconfig
arch/arm64/Kconfig
arch/x86/Kconfig
arch/x86/Kconfig.debug
include/linux/filter.h
include/linux/module.h
init/main.c
kernel/module.c