Merge tag 'rodata-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/Kconfig.debug
index 783099f,69cdd0b..c4cba00
--- 1/arch/x86/Kconfig.debug
--- 2/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@@ -109,17 -109,14 +109,6 @@@ config DEBUG_W
  
          If in doubt, say "Y".
  
- config DEBUG_SET_MODULE_RONX
-       bool "Set loadable kernel module data as NX and text as RO"
-       depends on MODULES
 -config DEBUG_NX_TEST
 -      tristate "Testcase for the NX non-executable stack feature"
 -      depends on DEBUG_KERNEL && m
--      ---help---
-         This option helps catch unintended modifications to loadable
-         kernel module's text and read-only data. It also prevents execution
-         of module data. Such protection may interfere with run-time code
-         patching and dynamic kernel tracing - and they might also protect
-         against certain classes of kernel exploits.
-         If in doubt, say "N".
 -        This option enables a testcase for the CPU NX capability
 -        and the software setup of this feature.
 -        If in doubt, say "N"
--
  config DOUBLEFAULT
        default y
        bool "Enable doublefault exception handler" if EXPERT

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

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

diff --cc init/main.c
Simple merge

diff --cc kernel/module.c
Simple merge