Hi Bartlomiej,
Today's linux-next merge of the ide tree got a conflict in
include/linux/blkdev.h between commit
42dad7647aec49b3ad20dd0cb832b232a6ae514f ("block: simplify I/O stat
accounting") from Linus' tree and commit
96c16743973e8c1a7b9c655d10b7973408d6d1dd ("ide-cd: fix REQ_QUIET tests in
cdrom_decode_status") from the ide tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc include/linux/blkdev.h
index 2755d5c,6f841fb..0000000
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@@ -600,7 -598,7 +600,8 @@@ enum
blk_failfast_transport(rq) || \
blk_failfast_driver(rq))
#define blk_rq_started(rq) ((rq)->cmd_flags & REQ_STARTED)
+ #define blk_rq_quiet(rq) ((rq)->cmd_flags & REQ_QUIET)
+#define blk_rq_io_stat(rq) ((rq)->cmd_flags & REQ_IO_STAT)
#define blk_account_rq(rq) (blk_rq_started(rq) && (blk_fs_request(rq) || blk_discard_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
