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/