Hi Jens,
Today's linux-next merge of the block tree got a conflict in
include/linux/blkdev.h between commit
79da0644a8e0838522828f106e4049639eea6baf ("Revert "block: improve
queue_should_plug() by looking at IO depths"") from Linus' tree and
commit 488991e28e55b4fbca8067edf0259f69d1a6f92c ("block: Added in
stricter no merge semantics for block I/O") from the block tree.
Context changes - I have fixed it up (see below) and can carry the fix
for a while. I suspect that you were expecting this. :-)
--
Cheers,
Stephen Rothwell [email protected]
diff --cc include/linux/blkdev.h
index 1896e86,f71f5c5..0000000
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@@ -461,7 -461,9 +461,8 @@@ struct request_queu
#define QUEUE_FLAG_NONROT 14 /* non-rotational device (SSD) */
#define QUEUE_FLAG_VIRT QUEUE_FLAG_NONROT /* paravirt device */
#define QUEUE_FLAG_IO_STAT 15 /* do IO stats */
-#define QUEUE_FLAG_CQ 16 /* hardware does queuing */
-#define QUEUE_FLAG_DISCARD 17 /* supports DISCARD */
-#define QUEUE_FLAG_NOXMERGES 18 /* No extended merges */
+#define QUEUE_FLAG_DISCARD 16 /* supports DISCARD */
++#define QUEUE_FLAG_NOXMERGES 17 /* No extended merges */
#define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \
(1 << QUEUE_FLAG_CLUSTER) | \
@@@ -585,8 -587,11 +586,10 @@@ enum
#define blk_queue_plugged(q) test_bit(QUEUE_FLAG_PLUGGED, &(q)->queue_flags)
#define blk_queue_tagged(q) test_bit(QUEUE_FLAG_QUEUED, &(q)->queue_flags)
-#define blk_queue_queuing(q) test_bit(QUEUE_FLAG_CQ, &(q)->queue_flags)
#define blk_queue_stopped(q) test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags)
#define blk_queue_nomerges(q) test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags)
+ #define blk_queue_noxmerges(q) \
+ test_bit(QUEUE_FLAG_NOXMERGES, &(q)->queue_flags)
#define blk_queue_nonrot(q) test_bit(QUEUE_FLAG_NONROT, &(q)->queue_flags)
#define blk_queue_io_stat(q) test_bit(QUEUE_FLAG_IO_STAT, &(q)->queue_flags)
#define blk_queue_flushing(q) ((q)->ordseq)
On Thu, Feb 25 2010, Stephen Rothwell wrote:
> Hi Jens,
>
> Today's linux-next merge of the block tree got a conflict in
> include/linux/blkdev.h between commit
> 79da0644a8e0838522828f106e4049639eea6baf ("Revert "block: improve
> queue_should_plug() by looking at IO depths"") from Linus' tree and
> commit 488991e28e55b4fbca8067edf0259f69d1a6f92c ("block: Added in
> stricter no merge semantics for block I/O") from the block tree.
>
> Context changes - I have fixed it up (see below) and can carry the fix
> for a while. I suspect that you were expecting this. :-)
I was, unfortunately I forgot to resolve the conflict yesterday. Your
fix confuses me a bit - I was expecting the first hunk, but what is the
second hunk doing? Conceptually good though, perhaps there are more
conflicts than I was expecting :-)
I'll update here as well so it disappears next time you pull.
--
Jens Axboe
Hi Jens,
On Thu, 25 Feb 2010 08:47:57 +0100 Jens Axboe <[email protected]> wrote:
>
> I was, unfortunately I forgot to resolve the conflict yesterday. Your
> fix confuses me a bit - I was expecting the first hunk, but what is the
> second hunk doing? Conceptually good though, perhaps there are more
> conflicts than I was expecting :-)
The second hunk was not part of the conflict, but "git diff" gives us more
than just the conflicted bit of the file.
> I'll update here as well so it disappears next time you pull.
Thanks.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Thu, Apr 29 2010, Stephen Rothwell wrote:
> Hi Jens,
>
> Today's linux-next merge of the block tree got a conflict in
> fs/block_dev.c between commit b8af67e2681c693a21f3933e3bdfce4cf66596d3
> ("fs/block_dev.c: fix performance regression in O_DIRECT|O_SYNC writes to
> block devices") from Linus' tree and commit
> fbd9b09a177a481eda256447c881f014f29034fe ("blkdev: generalize flags for
> blkdev_issue_fn functions") from the block tree.
>
> I fixed it up (see below) and can carry the fix for a while.
I'll merge -linus in to resolve this one so you don't have to carry this
fix.
--
Jens Axboe