Merge branches 'x86/asm', 'x86/debug', 'x86/mm', 'x86/setup', 'x86/urgent' and 'linus...

diff --cc arch/x86/Kconfig
index 87717f3687d2dce96a0cf91cc0d90d64ffa37a51,03f0a3aa43b101863845316f9e3bd38eae331d27,87717f3687d2dce96a0cf91cc0d90d64ffa37a51,87717f3687d2dce96a0cf91cc0d90d64ffa37a51,bc2fbadff9f90fe681d9c30ae621d1ec94e348cf..7fcf85182681c5d04be5d3e681cf47bdf11cabab
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
--- 3/arch/x86/Kconfig
--- 4/arch/x86/Kconfig
--- 5/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@@@@ -1431,8 -1437,8 -1431,8 -1431,8 -1400,8 +1437,8 @@@@@@ config CRASH_DUM
     config KEXEC_JUMP
        bool "kexec jump (EXPERIMENTAL)"
        depends on EXPERIMENTAL
 -  -   depends on KEXEC && HIBERNATION && X86_32
    -   help
 +  +   depends on KEXEC && HIBERNATION
    +   ---help---
          Jump between original kernel and kexeced kernel and invoke
          code in physical address mode via KEXEC
     

diff --cc arch/x86/mm/pageattr.c
Simple merge