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

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
kernel/sysctl.c between commit e164ade07b21 ("watchdog: add
watchdog_exclude sysctl to assist nohz") from the tile tree and commit
866d62a433cc ("watchdog: enable the new user interface of the watchdog
mechanism") 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                    s...@canb.auug.org.au

diff --cc kernel/sysctl.c
index 431601ad393a,076473547fe5..000000000000
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -861,13 -858,28 +859,35 @@@ static struct ctl_table kern_table[] = 
                .extra2         = &sixty,
        },
        {
 +              .procname       = "watchdog_exclude",
 +              .data           = &watchdog_exclude_mask_bits,
 +              .maxlen         = NR_CPUS,
 +              .mode           = 0644,
 +              .proc_handler   = proc_dowatchdog_exclude,
 +      },
 +      {
+               .procname       = "nmi_watchdog",
+               .data           = &nmi_watchdog_enabled,
+               .maxlen         = sizeof (int),
+               .mode           = 0644,
+               .proc_handler   = proc_nmi_watchdog,
+               .extra1         = &zero,
+ #if defined(CONFIG_HAVE_NMI_WATCHDOG) || defined(CONFIG_HARDLOCKUP_DETECTOR)
+               .extra2         = &one,
+ #else
+               .extra2         = &zero,
+ #endif
+       },
+       {
+               .procname       = "soft_watchdog",
+               .data           = &soft_watchdog_enabled,
+               .maxlen         = sizeof (int),
+               .mode           = 0644,
+               .proc_handler   = proc_soft_watchdog,
+               .extra1         = &zero,
+               .extra2         = &one,
+       },
+       {
                .procname       = "softlockup_panic",
                .data           = &softlockup_panic,
                .maxlen         = sizeof(int),

pgpgP8ce_z4M7.pgp
Description: OpenPGP digital signature