Subject: linux-next: manual merge of the akpm-current tree with the tile tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 7 Apr 2015 21:00:19 +1000

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
Documentation/sysctl/kernel.txt between commit e164ade07b21 ("watchdog:
add watchdog_exclude sysctl to assist nohz") from the tile tree and
commit 25909f748a50 ("watchdog: update documentation for kernel params
and sysctl") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc Documentation/sysctl/kernel.txt
index aad9f9ba347c,c831001c45f1..000000000000
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@@ -858,15 -904,25 +904,34 @@@ example.  If a system hangs up, try pre
  
  ==============================================================
  
+ watchdog:
+ 
+ This parameter can be used to disable or enable the soft lockup detector
+ _and_ the NMI watchdog (i.e. the hard lockup detector) at the same time.
+ 
+    0 - disable both lockup detectors
+    1 - enable both lockup detectors
+ 
+ The soft lockup detector and the NMI watchdog can also be disabled or
+ enabled individually, using the soft_watchdog and nmi_watchdog parameters.
+ If the watchdog parameter is read, for example by executing
+ 
+    cat /proc/sys/kernel/watchdog
+ 
+ the output of this command (0 or 1) shows the logical OR of soft_watchdog
+ and nmi_watchdog.
+ 
+ ==============================================================
+ 
 +watchdog_exclude:
 +
 +This value can be used to control on which cpus the watchdog is
 +prohibited from running.  The default exclude mask is empty, but if
 +NO_HZ_FULL is enabled in the kernel config, and cores are specified
 +with the nohz_full= boot argument, those cores are excluded by default.
 +
 +==============================================================
 +
  watchdog_thresh:
  
  This value can be used to control the frequency of hrtimer and NMI