Merge tag 'v4.12-rc5' into for-4.13/block

We've already got a few conflicts and upcoming work depends on some of the
changes that have gone into mainline as regression fixes for this series.

Pull in 4.12-rc5 to resolve these conflicts and make it easier on down stream
trees to continue working on 4.13 changes.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --cc block/bio-integrity.c
Simple merge

diff --cc block/blk-core.c
Simple merge

diff --cc block/blk-mq.c
index 7af78b1e9db98711f40eee9dae7f5a75211a778a,bb66c96850b18cb419b0e44aab1894169352f9af..da2f2196152519eded4d608eb8fb55fca9eaa3d9
--- 1/block/blk-mq.c
--- 2/block/blk-mq.c
+++ b/block/blk-mq.c
@@@ -1435,8 -1504,9 +1441,8 @@@ static void __blk_mq_try_issue_directly
                return;
        }
  
 -      __blk_mq_requeue_request(rq);
  insert:
-       blk_mq_sched_insert_request(rq, false, true, false, may_sleep);
+       blk_mq_sched_insert_request(rq, false, run_queue, false, may_sleep);
  }
  
  static void blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,

diff --cc block/cfq-iosched.c
Simple merge

diff --cc drivers/block/loop.c
Simple merge

diff --cc drivers/block/nbd.c
Simple merge

diff --cc drivers/block/rbd.c
Simple merge

diff --cc drivers/md/dm-bufio.c
Simple merge

diff --cc drivers/md/dm-integrity.c
Simple merge

diff --cc drivers/md/dm-raid1.c
Simple merge

diff --cc drivers/md/dm-verity-target.c
Simple merge

diff --cc drivers/md/dm.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/md/raid1.c
Simple merge

diff --cc drivers/md/raid10.c
Simple merge

diff --cc drivers/md/raid5-cache.c
Simple merge

diff --cc drivers/md/raid5-ppl.c
Simple merge

diff --cc drivers/md/raid5.c
Simple merge

diff --cc drivers/nvme/host/core.c
Simple merge

diff --cc drivers/nvme/host/fc.c
Simple merge

diff --cc drivers/nvme/host/pci.c
Simple merge

diff --cc drivers/nvme/host/rdma.c
index 58d311e704e5ce5f2283b741c0b2ebf25ef88ad4,24397d306d532213cf66e1ca0de9aa43bf12d3d5..131d76306e055182a61a133f4246ac1a56bbc6c1
--- 1/drivers/nvme/host/rdma.c
--- 2/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@@ -1441,14 -1443,25 +1443,25 @@@ static inline int nvme_rdma_queue_is_re
  
                if (!blk_rq_is_passthrough(rq) ||
                    cmd->common.opcode != nvme_fabrics_command ||
-                   cmd->fabrics.fctype != nvme_fabrics_type_connect)
-                       return false;
+                   cmd->fabrics.fctype != nvme_fabrics_type_connect) {
+                       /*
+                        * reconnecting state means transport disruption, which
+                        * can take a long time and even might fail permanently,
+                        * so we can't let incoming I/O be requeued forever.
+                        * fail it fast to allow upper layers a chance to
+                        * failover.
+                        */
+                       if (queue->ctrl->ctrl.state == NVME_CTRL_RECONNECTING)
+                               return -EIO;
+                       else
+                               return -EAGAIN;
+               }
        }
  
-       return true;
+       return 0;
  }
  
 -static int nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx,
 +static blk_status_t nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx,
                const struct blk_mq_queue_data *bd)
  {
        struct nvme_ns *ns = hctx->queue->queuedata;

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/extent_io.c
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/xfs/xfs_buf.c
Simple merge