Merge branch 'core/urgent' into core/locking

It's not really a regression fix, so move it to the v3.15 queue.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined Documentation/sysctl/kernel.txt
index e55124e,621c56c..e1d28fb
--- 1/Documentation/sysctl/kernel.txt
--- 2/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@@ -37,7 -37,6 +37,7 @@@ show up in /proc/sys/kernel
  - hung_task_check_count
  - hung_task_timeout_secs
  - hung_task_warnings
 +- kexec_load_disabled
  - kptr_restrict
  - kstack_depth_to_print       [ X86 only ]
  - l2cr                        [ PPC only ]
@@@ -320,28 -319,17 +320,29 @@@ This file shows up if CONFIG_DETECT_HUN
  
  ==============================================================
  
- hung_task_warning:
+ hung_task_warnings:
  
  The maximum number of warnings to report. During a check interval
- When this value is reached, no more the warnings will be reported.
+ if a hung task is detected, this value is decreased by 1.
+ When this value reaches 0, no more warnings will be reported.
  This file shows up if CONFIG_DETECT_HUNG_TASK is enabled.
  
  -1: report an infinite number of warnings.
  
  ==============================================================
  
 +kexec_load_disabled:
 +
 +A toggle indicating if the kexec_load syscall has been disabled. This
 +value defaults to 0 (false: kexec_load enabled), but can be set to 1
 +(true: kexec_load disabled). Once true, kexec can no longer be used, and
 +the toggle cannot be set back to false. This allows a kexec image to be
 +loaded before disabling the syscall, allowing a system to set up (and
 +later use) an image without it being altered. Generally used together
 +with the "modules_disabled" sysctl.
 +
 +==============================================================
 +
  kptr_restrict:
  
  This toggle indicates whether restrictions are placed on
@@@ -386,7 -374,7 +387,7 @@@ A toggle value indicating if modules ar
  in an otherwise modular kernel.  This toggle defaults to off
  (0), but can be set true (1).  Once true, modules can be
  neither loaded nor unloaded, and the toggle cannot be set back
 -to false.
 +to false.  Generally used with the "kexec_load_disabled" toggle.
  
  ==============================================================