public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	linux-kernel@vger.kernel.org, akpm@linux-foundation.org,
	cl@linux-foundation.org, hannes@cmpxchg.org, mpm@selenic.com,
	npiggin@suse.de, yinghai@kernel.org
Subject: Re: [GIT PULL] Early boot SLAB for 2.6.31
Date: Wed, 10 Jun 2009 22:50:26 +0200	[thread overview]
Message-ID: <20090610205026.GC8147@elte.hu> (raw)
In-Reply-To: <84144f020906101347y3e250f4bme2d1c60dd5993ffc@mail.gmail.com>


* Pekka Enberg <penberg@cs.helsinki.fi> wrote:

> On Wed, Jun 10, 2009 at 11:43 PM, Ingo Molnar<mingo@elte.hu> wrote:
> >
> > * Pekka Enberg <penberg@cs.helsinki.fi> wrote:
> >
> >> Linus Torvalds wrote:
> >>>
> >>> On Wed, 10 Jun 2009, Pekka J Enberg wrote:
> >>
> >>>> I already have patches for that but they are against the -tip
> >>>> tree so I think we ought to just merge this series to mainline
> >>>> and fix everything up in subsystem trees for 2.6.31 proper.
> >>>
> >>> Hmm. Are there any reasons why the scheduler fixups can't go in
> >>> this series? Do they depend on other things in -tip?
> >>
> >> The patches are rebased to -tip, yeah. I can do a version against
> >> your tree if you want but that will mean merge conflicts for Ingo.
> >> Hmm?
> >
> > I'm a tiny bit nervous about the tested-ness of the patches. Such
> > stuff rarely works at first try. But it's obviously nice changes.
> 
> Yeah, I was thinking of sitting on them until 2.6.32 and put them 
> into linux-next after the merge window closes. [...]

Nah, that would be unreasonably long.

> [...] But Linus seems to want them and with the fallback in place, 
> we can probably fix any fall out quite easily.

Yeah.

> > What kind of conflicts are there against -tip? The diffstat 
> > suggests it's mostly in-SLAB code, right? There shouldnt be much 
> > to conflict, except kmemcheck - which has more or less trivial 
> > callbacks there.
> 
> The conflicting bits are the patches that remove bootmem allocator 
> uses in arch/x86 and kernel/sched.c.

Give me an hour and i'll get some minimal testing done.

	Ingo

  reply	other threads:[~2009-06-10 20:51 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-10 20:12 [GIT PULL] Early boot SLAB for 2.6.31 Pekka J Enberg
2009-06-10 20:32 ` Linus Torvalds
2009-06-10 20:30   ` Pekka Enberg
2009-06-10 20:43     ` Ingo Molnar
2009-06-10 20:47       ` Pekka Enberg
2009-06-10 20:50         ` Ingo Molnar [this message]
2009-06-10 20:57           ` Ingo Molnar
2009-06-10 20:58             ` Pekka Enberg
2009-06-10 21:07             ` Pekka Enberg
2009-06-11  0:54               ` Ingo Molnar
2009-06-10 21:00           ` Pekka J Enberg
2009-06-10 20:33   ` Linus Torvalds
2009-06-10 20:57     ` Pekka J Enberg
2009-06-11 11:17     ` [GIT PULL v2] " Pekka J Enberg
2009-06-11 11:35       ` Ingo Molnar
2009-06-11 11:40         ` Ingo Molnar
2009-06-11 11:42           ` Ingo Molnar
2009-06-11 11:48             ` Ingo Molnar
2009-06-11 11:56               ` Pekka Enberg
2009-06-11 11:49           ` Pekka J Enberg
2009-06-11 11:54         ` Ingo Molnar
2009-06-11 13:58       ` Christoph Lameter
2009-06-11 14:06         ` Pekka Enberg
2009-06-11 14:26           ` Christoph Lameter
2009-06-11 15:24           ` Pekka Enberg
2009-06-11 17:50             ` Yinghai Lu
2009-06-11 18:10               ` [GIT PULL v3] " Pekka J Enberg
2009-06-11 21:43                 ` Ingo Molnar
2009-06-11 22:03                   ` Ingo Molnar
2009-06-11 22:41                     ` Yinghai Lu
2009-06-12  8:33                       ` Pekka Enberg
2009-06-12  7:17                     ` Ingo Molnar
2009-06-12  7:25                       ` Li Zefan
2009-06-12  7:29                       ` Pekka Enberg
2009-06-12  7:29                         ` KAMEZAWA Hiroyuki
2009-06-12  7:33                         ` Li Zefan
2009-06-12  7:51                         ` Ingo Molnar
2009-06-11 23:14                   ` Yinghai Lu
2009-06-12  8:37                     ` Pekka Enberg
2009-06-10 21:00 ` [GIT PULL] " Ingo Molnar
2009-06-10 20:57   ` Pekka Enberg
2009-06-10 21:03   ` Yinghai Lu
2009-06-10 21:11   ` Yinghai Lu

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=20090610205026.GC8147@elte.hu \
    --to=mingo@elte.hu \
    --cc=akpm@linux-foundation.org \
    --cc=cl@linux-foundation.org \
    --cc=hannes@cmpxchg.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mpm@selenic.com \
    --cc=npiggin@suse.de \
    --cc=penberg@cs.helsinki.fi \
    --cc=torvalds@linux-foundation.org \
    --cc=yinghai@kernel.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