From: Pekka Enberg <penberg@cs.helsinki.fi>
To: Ingo Molnar <mingo@elte.hu>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Christoph Lameter <cl@linux-foundation.org>,
linux-next@vger.kernel.org,
Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: Re: linux-next: manual merge of the slab tree with the ftrace tree
Date: Fri, 20 Feb 2009 13:12:41 +0200 [thread overview]
Message-ID: <1235128361.29813.32.camel@penberg-laptop> (raw)
In-Reply-To: <20090220095355.GL24555@elte.hu>
Hi Ingo,
On Fri, 2009-02-20 at 10:53 +0100, Ingo Molnar wrote:
> > Is it a big problem, though? We could do the
> > s/PAGE_SIZE/SLUB_MAX_SIZE/g rename as a separate preparational
> > patch (without any of the functional changes) and see if Linus
> > merges it to mainline...
>
> Linus does not have to merge the changes - it's enough if both
> you and me merge it, then there will be no conflicts if the two
> trees are combined - Git will sort it all out.
>
> Could you prepare such a patch please, merge it into a separate
> (and append-only) branch your tree and then send me a pull
> request after a bit of testing so i can merge it into the
> tracing tree?
Aye, aye, cap'n:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git for-ingo
the commit is here in case someone wants to take a look at it:
http://git.kernel.org/?p=linux/kernel/git/penberg/slab-2.6.git;a=commitdiff;h=fe1200b63d158b28eef6d4de1e5b5f99c681ba2f
Pekka
next prev parent reply other threads:[~2009-02-20 11:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-20 5:57 linux-next: manual merge of the slab tree with the ftrace tree Stephen Rothwell
2009-02-20 8:25 ` Pekka Enberg
2009-02-20 8:59 ` Stephen Rothwell
2009-02-20 9:37 ` Ingo Molnar
2009-02-20 9:41 ` Pekka Enberg
2009-02-20 9:53 ` Ingo Molnar
2009-02-20 11:12 ` Pekka Enberg [this message]
2009-02-20 11:16 ` Ingo Molnar
2009-02-20 23:07 ` Stephen Rothwell
2009-02-20 22:58 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-01-20 3:57 Stephen Rothwell
2009-01-20 6:01 ` Matt Mackall
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=1235128361.29813.32.camel@penberg-laptop \
--to=penberg@cs.helsinki.fi \
--cc=cl@linux-foundation.org \
--cc=eduard.munteanu@linux360.ro \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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