From: Rusty Russell <rusty@rustcorp.com.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andi Kleen <ak@linux.intel.com>,
"Al Viro" <viro@zeniv.linux.org.uk>
Subject: Re: linux-next: manual merge of the akpm tree with the rr tree
Date: Mon, 14 May 2012 10:59:34 +0930 [thread overview]
Message-ID: <877gwfv9c1.fsf@rustcorp.com.au> (raw)
In-Reply-To: <20120510185155.47d24f37951786b64af97868@canb.auug.org.au>
On Thu, 10 May 2012 18:51:55 +1000, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got conflicts in
> kernel/lglock.c, include/linux/lglock.h, fs/namespace.c and fs/internal.h
> between various commits from the rr tree and commit "brlocks/lglocks:
> cleanups" from the akpm tree.
>
> The akpm tree patch seems to be a merge of the rr tree commits, so I
> dropped the akpm tree patch.
Al said he'd take them, so I dropped mine now too.
Thanks,
Rusty.
next prev parent reply other threads:[~2012-05-14 1:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-10 8:51 linux-next: manual merge of the akpm tree with the rr tree Stephen Rothwell
2012-05-14 1:29 ` Rusty Russell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-07-26 4:25 Stephen Rothwell
2012-07-26 4:32 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=877gwfv9c1.fsf@rustcorp.com.au \
--to=rusty@rustcorp.com.au \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@zeniv.linux.org.uk \
/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