linux-kernel - Re: [GIT pull] bkl core patches for 2.6.33

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <m17hsx1zbw.fsf@fess.ebiederm.org>
Date:	Tue, 08 Dec 2009 03:26:27 -0800
From:	ebiederm@...ssion.com (Eric W. Biederman)
To:	Thomas Gleixner <tglx@...utronix.de>
Cc:	Linus Torvalds <torvalds@...ux-foundation.org>,
	Andrew Morton <akpm@...ux-foundation.org>,
	LKML <linux-kernel@...r.kernel.org>, Ingo Molnar <mingo@...e.hu>,
	Arnd Bergmann <arnd@...db.de>
Subject: Re: [GIT pull] bkl core patches for 2.6.33

Thomas Gleixner <tglx@...utronix.de> writes:

> On Mon, 7 Dec 2009, Eric W. Biederman wrote:
>> Thomas Gleixner <tglx@...utronix.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.  That is one less minor conflict to worry about.

Eric
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/