* linux-next: manual merge of the akpm with the block tree
@ 2011-09-22 8:26 Stephen Rothwell
2011-09-22 13:37 ` Christoph Hellwig
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2011-09-22 8:26 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Christoph Hellwig, Eric Miao
[-- Attachment #1: Type: text/plain, Size: 564 bytes --]
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.
The former turns function brd_make_request() return void, so the latter
patch is no longer useful, so I dropped it.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the akpm with the block tree
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
2011-09-22 16:56 ` Andrew Morton
0 siblings, 1 reply; 3+ messages in thread
From: Christoph Hellwig @ 2011-09-22 13:37 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel, Christoph Hellwig,
Eric Miao
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.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the akpm with the block tree
2011-09-22 13:37 ` Christoph Hellwig
@ 2011-09-22 16:56 ` Andrew Morton
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Morton @ 2011-09-22 16:56 UTC (permalink / raw)
To: Christoph Hellwig
Cc: Stephen Rothwell, Andrew Morton, linux-next, linux-kernel,
Eric Miao
On Thu, 22 Sep 2011 09:37:17 -0400 Christoph Hellwig <hch@infradead.org> wrote:
> 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.
Yes, drivers-block-brdc-make-brd_make_request-return-error-code.patch
should be (has been) dropped.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-22 16:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2011-09-22 16:56 ` Andrew Morton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox