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

From: Mark Brown <[email-masked]>
Date: Mon, 10 Mar 2014 15:39:50 +0000

Hi Jens,

Today's linux-next merge of the block tree got a conflict in block/blk-mq.c between commit d6a25b31315327 (blk-mq: support partial I/O completions) from Linus' tree and commit af5040da01ef (blktrace: fix accounting of partially completed requests) from the block tree.

I fixed it up by dropping the hunk from af5040da01ef in a way git doesn't seem easily persuaded to show as a resolution and can carry the fix as necessary (no action is required).