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

From: Jens Axboe <[email-masked]>
Date: Fri, 5 Sep 2008 08:22:38 +0200

On Fri, Sep 05 2008, Stephen Rothwell wrote:
> Hi Jens,
> 
> Today's linux-next merge of the block tree got a conflict in
> include/linux/bio.h and include/linux/blkdev.h between commit
> 81449f3f2013d92ec3bcb9d2c1877ce3140d2271 ("[SCSI] block: separate
> failfast into multiple bits") from the scsi tree and commit
> 5d112a624058caabe5b570d2c9827bce82c18be1 ("Add 'discard' request
> handling") from the block tree.
> 
> Overlapping changes/additions to some bit definitions.  I have fixed it
> up as best I can (see below) and can carry the fix.

James, would it not have been a lot better to carry the block bits in
the block tree instead??

-- 
Jens Axboe