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

From: Jens Axboe <[email-masked]>
Date: Fri, 7 Nov 2008 10:50:08 +0100

On Fri, Nov 07 2008, Stephen Rothwell wrote:
> Hi Jens,
> 
> Today's linux-next merge of the block tree got a conflict in
> block/elevator.c between commit 2920ebbd65f3e80c318adf5191ac0987142bda80
> ("block: add timer on blkdev_dequeue_request() not elv_next_request()")
> from Linus' tree and commit 8b3806453dd25d15a7ca7d537124af14ba8546bc
> ("blktrace: port to tracepoints") from the block tree.
> 
> Just a context change.  I fixed it up (see below) and assume it will be
> fixed in your tree soon.

Both of these merge errors will go away very shortly, since I'll rebase
for-next on master again due to the recent merge.

-- 
Jens Axboe