From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Rientjes <rientjes@google.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the rcu tree
Date: Sun, 9 Feb 2014 21:24:43 -0800 [thread overview]
Message-ID: <20140210052443.GH4250@linux.vnet.ibm.com> (raw)
In-Reply-To: <20140210150047.65f06219ffa970ad34d27d7f@canb.auug.org.au>
On Mon, Feb 10, 2014 at 03:00:47PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in
> mm/slub.c between commit f4e40a71719d ("slub: Fix add_full() lockdep
> checks") from the rcu tree and commit aee03fe7a7c8 ("mm/slub.c: list_lock
> may not be held in some circumstances") from the akpm-current tree.
>
> These patches try to achieve the same thing, so I arbitrarily chose the
> version from the akpm-current tree.
My bad -- I forgot to remove my version.
Thanx, Paul
next prev parent reply other threads:[~2014-02-10 5:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-10 4:00 linux-next: manual merge of the akpm-current tree with the rcu tree Stephen Rothwell
2014-02-10 5:24 ` Paul E. McKenney [this message]
2014-09-08 8:53 Stephen Rothwell
2020-05-19 16:12 Stephen Rothwell
2021-05-12 5:04 Stephen Rothwell
2021-05-12 14:04 ` Yury Norov
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=20140210052443.GH4250@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rientjes@google.com \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).