From: Asai Thambi S P <asamymuthupa@micron.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,
Sam Bradshaw <sbradshaw@micron.com>, Jens Axboe <axboe@kernel.dk>,
Kent Overstreet <koverstreet@google.com>
Subject: Re: linux-next: manual merge of the akpm tree with the block tree
Date: Tue, 15 Jan 2013 20:03:07 +0530 [thread overview]
Message-ID: <50F568A3.3060602@micron.com> (raw)
In-Reply-To: <20130114145816.397108bb0b1aec82e77d5a7a@canb.auug.org.au>
On 1/14/2013 9:28 AM, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/block/mtip32xx/mtip32xx.c between commit 16c906e51c6f ("mtip32xx:
> Add workqueue and NUMA support") from the tree and commit "mtip32xx:
> convert to batch completion" from the akpm tree.
>
> I couldn't see how to fix up the conflicts, so I just dropped the akpm
> tree patch.
>
I will fix this and send out the patch.
--
Regards,
Asai
WARNING: multiple messages have this Message-ID (diff)
From: Asai Thambi S P <asamymuthupa@micron.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>,
Sam Bradshaw <sbradshaw@micron.com>,
"Jens Axboe" <axboe@kernel.dk>,
Kent Overstreet <koverstreet@google.com>
Subject: Re: linux-next: manual merge of the akpm tree with the block tree
Date: Tue, 15 Jan 2013 20:03:07 +0530 [thread overview]
Message-ID: <50F568A3.3060602@micron.com> (raw)
In-Reply-To: <20130114145816.397108bb0b1aec82e77d5a7a@canb.auug.org.au>
On 1/14/2013 9:28 AM, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/block/mtip32xx/mtip32xx.c between commit 16c906e51c6f ("mtip32xx:
> Add workqueue and NUMA support") from the tree and commit "mtip32xx:
> convert to batch completion" from the akpm tree.
>
> I couldn't see how to fix up the conflicts, so I just dropped the akpm
> tree patch.
>
I will fix this and send out the patch.
--
Regards,
Asai
next prev parent reply other threads:[~2013-01-15 14:36 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-14 3:58 linux-next: manual merge of the akpm tree with the block tree Stephen Rothwell
2013-01-15 14:33 ` Asai Thambi S P [this message]
2013-01-15 14:33 ` Asai Thambi S P
-- strict thread matches above, loose matches on Subject: below --
2017-02-03 4:53 Stephen Rothwell
2015-01-21 7:46 Stephen Rothwell
2013-04-30 6:02 Stephen Rothwell
2013-03-26 5:33 Stephen Rothwell
2013-03-26 5:25 Stephen Rothwell
2013-03-26 5:11 Stephen Rothwell
2013-01-15 3:10 Stephen Rothwell
2012-11-12 4:15 Stephen Rothwell
2012-11-12 21:07 ` Andrew Morton
2012-11-12 21:20 ` Jens Axboe
2012-11-12 21:29 ` Andrew Morton
2012-11-12 21:30 ` Jens Axboe
2011-10-25 9:07 Stephen Rothwell
2011-10-25 18:20 ` Mike Miller
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=50F568A3.3060602@micron.com \
--to=asamymuthupa@micron.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=koverstreet@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sbradshaw@micron.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.