Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/block_dev.c
between commit:
6f3b0e8bcf3c ("blk-mq: add a flags parameter to blk_mq_alloc_request")
from the block tree and commit:
f39b774555f0 ("fs/block_dev.c:bdev_write_page(): use blk_queue_enter(..., GFP_NOIO)")
from the akpm-current tree.
I fixed it up (see below, though I am not sure it is the correct fix?) and
can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc fs/block_dev.c
index aa1a45985889,c27362de0039..000000000000
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@@ -432,7 -432,7 +432,7 @@@ int bdev_write_page(struct block_devic
if (!ops->rw_page || bdev_get_integrity(bdev))
return -EOPNOTSUPP;
- result = blk_queue_enter(bdev->bd_queue, false);
- result = blk_queue_enter(bdev->bd_queue, GFP_NOIO);
++ result = blk_queue_enter(bdev->bd_queue, true);
if (result)
return result;
--
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
