Subject: Re: linux-next: manual merge of the block tree with the Linus' tree

From: Jens Axboe <[email-masked]>
Date: Thu, 16 Sep 2010 08:26:29 +0200

On 2010-09-16 04:04, Stephen Rothwell wrote:
> Hi Jens,
> 
> Today's linux-next merge of the block tree got a conflict in
> drivers/block/loop.c between commit
> 5e00d1b5b4c10fb839afd5ce61db8e24339454b0 ("BLOCK: fix bio.bi_rw
> handling") from Linus' tree and commit
> 6259f28459a9de820f47a9ece4ffa22d4596a9af ("block/loop: implement
> REQ_FLUSH/FUA support") from the block tree.
> 
> I fixed it up (the latter removed the line that the former changed) and
> can carry the fix as necessary.

Thanks Stephen, I will merge in -git in for-next to resolve these
for you so you don't have to carry it.

-- 
Jens Axboe