From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Cc: linux-next@vger•kernel.org, Matthew Wilcox <matthew@wil•cx>,
Andrew Morton <akpm@linux-foundation•org>
Subject: linux-next: manual merge of the tip-core tree with Linus' tree
Date: Mon, 6 Apr 2009 10:36:32 +1000 [thread overview]
Message-ID: <20090406103632.111615c8.sfr@canb.auug.org.au> (raw)
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@canb•auug.org.au
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;
next reply other threads:[~2009-04-06 0:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-06 0:36 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-05-21 1:39 linux-next: manual merge of the tip-core tree with Linus' tree Stephen Rothwell
2009-05-21 3:56 ` Darren Hart
2009-05-21 9:30 ` Thomas Gleixner
2009-05-21 9:38 ` Stephen Rothwell
2009-05-22 0:19 ` Stephen Rothwell
2009-05-22 5:50 ` Stephen Rothwell
2009-05-22 18:18 ` Darren Hart
2009-02-09 0:38 Stephen Rothwell
2009-02-09 0:46 ` Chris Mason
2009-02-09 8:51 ` Ingo Molnar
2009-02-06 2:26 Stephen Rothwell
2009-02-06 13:53 ` Ingo Molnar
2009-02-02 0:46 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090406103632.111615c8.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=matthew@wil$(echo .)cx \
--cc=mingo@elte$(echo .)hu \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox