Messages in this thread | | | From | (Eric W. Biederman) | Date | Tue, 08 Dec 2009 03:26:27 -0800 | Subject | Re: [GIT pull] bkl core patches for 2.6.33 |
| |
Thomas Gleixner <tglx@linutronix.de> writes:
> 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. That is one less minor conflict to worry about.
Eric
| |