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

From: Jens Axboe <[email-masked]>
Date: Wed, 19 Nov 2008 10:14:48 +0100

On Wed, Nov 19 2008, Stephen Rothwell wrote:
> Hi Jens,
> 
> Today's linux-next merge of the block tree got a conflict in
> drivers/block/xen-blkfront.c between commit
> 68aee07f9bad2c830a898cf6d6bfc11ea24efc40 ("Release old elevator on change
> elevator") from Linus' tree and commit
> f7ed11048c85660828fa2017ea2e3da27235f76a ("xen-blkfront: set queue
> paravirt flag") from the block tree.
> 
> I used the version from the block tree and will carry this fix for a
> while but assume that you will fix the conflict in the block tree soon.

Just noticed that myself as well, will update for-next now.

-- 
Jens Axboe