Hi all,
Today's linux-next merge of the kmemcheck tree got a conflict in
kernel/sysctl.c between commit af936a1606246a10c145feac3770f6287f483f02
("vmscan: unevictable LRU scan sysctl") from Linus' tree and commit
385e31b9eae0528bada07d16a189f3f40df23961 ("kmemcheck: add the kmemcheck
core") from the kmemcheck tree.
Just overlapping additions (combined with a bad merge in the kmemcheck
tree). I fixed it up (see below).
[Ingo: it looks like commit 05416cc42ac7072f39bcff036485e2b0fc1da3a9
("Merge branch 'linus' into kmemcheck") in the kmemcheck tree merged the
"rcutorture_runnable" sysctl into the wrong table.]
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc kernel/sysctl.c
index b3cc739,3383afd..0000000
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -823,26 -825,17 +824,37 @@@ static struct ctl_table kern_table[] =
.child = key_sysctls,
},
#endif
+#ifdef CONFIG_RCU_TORTURE_TEST
+ {
+ .ctl_name = CTL_UNNUMBERED,
+ .procname = "rcutorture_runnable",
+ .data = &rcutorture_runnable,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec,
+ },
+#endif
+#ifdef CONFIG_UNEVICTABLE_LRU
+ {
+ .ctl_name = CTL_UNNUMBERED,
+ .procname = "scan_unevictable_pages",
+ .data = &scan_unevictable_pages,
+ .maxlen = sizeof(scan_unevictable_pages),
+ .mode = 0644,
+ .proc_handler = &scan_unevictable_handler,
+ },
+#endif
+ #ifdef CONFIG_KMEMCHECK
+ {
+ .ctl_name = CTL_UNNUMBERED,
+ .procname = "kmemcheck",
+ .data = &kmemcheck_enabled,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec,
+ },
+ #endif
+
/*
* NOTE: do not add new entries to this table unless you have read
* Documentation/sysctl/ctl_unnumbered.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
