From: Christoph Hellwig <hch@infradead.org>
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,
Christoph Hellwig <hch@infradead.org>,
Eric Miao <eric.miao@linaro.org>
Subject: Re: linux-next: manual merge of the akpm with the block tree
Date: Thu, 22 Sep 2011 09:37:17 -0400 [thread overview]
Message-ID: <20110922133717.GA21575@infradead.org> (raw)
In-Reply-To: <20110922182625.4a18ee494a0f3bf977fc8ea3@canb.auug.org.au>
On Thu, Sep 22, 2011 at 06:26:25PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the scsi-post-merge tree got a conflict in
> drivers/block/brd.c between commit 5a7bbad27a41 ("block: remove support
> for bio remapping from ->make_request") from the block tree and commit
> 4559c71773c5 ("brd_make_request() always returns 0, which doesn't make
> much sense") from the akpm tree.
Where did the latter patch come from? Given that brd_make_request is
for the ramdisk driver that never does remapping returning anything but
zero would be a bug anyway.
next prev parent reply other threads:[~2011-09-22 13:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-22 8:26 linux-next: manual merge of the akpm with the block tree Stephen Rothwell
2011-09-22 13:37 ` Christoph Hellwig [this message]
2011-09-22 16:56 ` Andrew Morton
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=20110922133717.GA21575@infradead.org \
--to=hch@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=eric.miao@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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