From: Manfred Spraul <manfred@colorfullife.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Steven Rostedt <rostedt@goodmis.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Linus <torvalds@linux-foundation.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: Re: linux-next: manual merge of the akpm tree with the tree
Date: Mon, 06 May 2013 20:59:18 +0200 [thread overview]
Message-ID: <5187FD86.9000005@colorfullife.com> (raw)
In-Reply-To: <20130506135109.9c0b24ea1e22784fb28ae6b9@canb.auug.org.au>
Hi,
On 05/06/2013 05:51 AM, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in ipc/sem.c
> between commit 321310ced2d6 ("ipc: move sem_obtain_lock() rcu locking
> into the only caller") from Linus' tree and commit "ipc/sem.c:
> alternatives to preempt_disable()" from the akpm tree.
I would propose that 'ipc/sem.c: alternatives to preempt_disable()' is
dropped.
As explained in the commit:
That patch is for CONFIG_PREEMPT_RT, it should go into their tree.
--
Manfred
next prev parent reply other threads:[~2013-05-06 18:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-06 3:51 linux-next: manual merge of the akpm tree with the tree Stephen Rothwell
2013-05-06 18:59 ` Manfred Spraul [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-09-24 13:45 Stephen Rothwell
2012-09-24 13:29 Stephen Rothwell
2012-05-31 3:50 Stephen Rothwell
2012-05-10 8:41 Stephen Rothwell
2011-09-27 6:59 Stephen Rothwell
2011-09-27 12:22 ` Frederic Weisbecker
2011-09-27 16:52 ` Vaibhav Nagarnaik
2011-09-27 23:03 ` Stephen Rothwell
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=5187FD86.9000005@colorfullife.com \
--to=manfred@colorfullife.com \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.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