Hi all,
Today's linux-next merge of the tip-core tree got a conflict in
kernel/sysctl.c between commit 8e654fba4a376f436bdfe361fc5cdbc87ac09b35
("sysctl: fix suid_dumpable and lease-break-time sysctls") from Linus'
tree and commit 9f8d979f082a3ee1b27f32b7e0811b51c3ad1d15 ("softlockup:
move 'one' to the softlockup section in sysctl.c") from the tip-core tree.
I fixed it up (see below) and can carry the fix as necessary. This seems
to be the same fixup that is in tip/master.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc kernel/sysctl.c
index 82350f8,6d2aeff..0000000
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -96,9 -98,11 +99,8 @@@ static int sixty = 60
static int neg_one = -1;
#endif
-#if defined(CONFIG_MMU) && defined(CONFIG_FILE_LOCKING)
-static int two = 2;
-#endif
-
static int zero;
- static int one = 1;
+static int two = 2;
static unsigned long one_ul = 1;
static int one_hundred = 100;
--
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
