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.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc block/elevator.c
index 9ac82dd,e09183b..0000000
--- a/block/elevator.c
+++ b/block/elevator.c
@@@ -772,7 -787,13 +787,7 @@@ struct request *elv_next_request(struc
* not be passed by new incoming requests
*/
rq->cmd_flags |= REQ_STARTED;
- blk_add_trace_rq(q, rq, BLK_TA_ISSUE);
+ trace_block_rq_issue(q, rq);
-
- /*
- * We are now handing the request to the hardware,
- * add the timeout handler
- */
- blk_add_timer(rq);
}
if (!q->boundary_rq || q->boundary_rq == rq) {
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
