From: Pekka Enberg <penberg@cs.helsinki.fi>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Nick Piggin <npiggin@suse.de>
Subject: Re: linux-next: manual merge of the tip tree with the slab tree
Date: Mon, 06 Jul 2009 11:01:07 +0300 [thread overview]
Message-ID: <1246867267.4957.5.camel@penberg-laptop> (raw)
In-Reply-To: <20090706144051.06d079a5.sfr@canb.auug.org.au>
On Mon, 2009-07-06 at 14:40 +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the tip tree got a conflict in
> include/linux/rcupdate.h between commit
> 249acdd3fd13d1ec579ff9b1c5273cf5515cd352 ("SLQB slab allocator (try 2)")
> from the slab tree and commit 03b042bf1dc14a268a3d65d38b4ec2a4261e8477
> ("rcu: Add synchronize_sched_expedited() primitive") from the tip tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Yup, looks good to me. Thanks, Stephen!
next parent reply other threads:[~2009-07-06 8:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20090706144051.06d079a5.sfr@canb.auug.org.au>
2009-07-06 8:01 ` Pekka Enberg [this message]
[not found] ` <20090914155219.13118819.sfr@canb.auug.org.au>
2009-09-14 6:35 ` linux-next: manual merge of the tip tree with the slab tree Pekka Enberg
2012-06-21 3:48 Stephen Rothwell
2012-06-21 7:24 ` David Rientjes
-- strict thread matches above, loose matches on Subject: below --
2010-09-23 3:44 Stephen Rothwell
2010-09-23 9:33 ` Pekka Enberg
2010-09-23 9:46 ` Tejun Heo
2009-06-16 5:46 Stephen Rothwell
2009-06-16 5:48 ` Pekka Enberg
2009-06-16 7:44 ` Ingo Molnar
2009-06-16 7:46 ` Pekka Enberg
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=1246867267.4957.5.camel@penberg-laptop \
--to=penberg@cs.helsinki.fi \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=npiggin@suse.de \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--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