From: Thomas Gleixner <tglx@linutronix.de>
To: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>, Ingo Molnar <mingo@elte.hu>,
Arnd Bergmann <arnd@arndb.de>
Subject: Re: [GIT pull] bkl core patches for 2.6.33
Date: Tue, 8 Dec 2009 12:14:09 +0100 (CET) [thread overview]
Message-ID: <alpine.LFD.2.00.0912081211350.3089@localhost.localdomain> (raw)
In-Reply-To: <m1iqci4ful.fsf@fess.ebiederm.org>
On Mon, 7 Dec 2009, Eric W. Biederman wrote:
> Thomas Gleixner <tglx@linutronix.de> writes:
>
> > Linus,
> >
> > Please pull the latest bkl-core-for-linus git tree from:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git bkl-core-for-linus
> >
> > Thanks,
>
>
> Was this tree in linux-next? I'm certain I would have remembered the
> conflict in kernel/sysctl.c. Among other things in my sysctl tree
> lock_kernel() is gone. The removal of lock_kernel() happened to fall
> out of my other changes. I remember having a conversation with Arnd
> Bergmann about this, and the conclusion being was that my change
> correct and superior to this patch. So I'm surprised a sysctl change
> made it into your tree.
Sorry, that change was excluded from next and I completely forgot
about your patches when I was preparing the pull request. Zapped the
commit in question already.
Thanks,
tglx
next prev parent reply other threads:[~2009-12-08 11:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-06 17:58 [GIT pull] bkl core patches for 2.6.33 Thomas Gleixner
2009-12-06 18:46 ` Linus Torvalds
2009-12-06 18:49 ` Thomas Gleixner
2009-12-07 8:31 ` Frederic Weisbecker
2009-12-06 18:52 ` Ingo Molnar
2009-12-06 23:00 ` Stephen Rothwell
2009-12-07 21:46 ` Eric W. Biederman
2009-12-08 11:14 ` Thomas Gleixner [this message]
2009-12-08 11:26 ` Eric W. Biederman
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=alpine.LFD.2.00.0912081211350.3089@localhost.localdomain \
--to=tglx@linutronix.de \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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