Merge branch 'for-next' of git://git.kernel.dk/linux-block.git

# Conflicts:
#	tools/testing/selftests/drivers/net/hw/Makefile

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/block/null_blk/main.c
Simple merge

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

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

diff --cc drivers/mmc/host/sdhci-msm.c
Simple merge

diff --cc drivers/nvdimm/pmem.c
Simple merge

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

diff --cc drivers/nvme/host/ioctl.c
index 24e2c702da7a2e25c74e45c0d52dcc1ff88f7748,98a0750c0cda5e3b463415af627c86b4e89b26e6..ecf136489044ff3ac851a0f0bd26e8c4aa4b9ad2
--- 1/drivers/nvme/host/ioctl.c
--- 2/drivers/nvme/host/ioctl.c
+++ b/drivers/nvme/host/ioctl.c
@@@ -141,12 -140,11 +142,13 @@@ static int nvme_map_user_request(struc
                struct iov_iter iter;
  
                /* fixedbufs is only for non-vectored io */
 -              if (WARN_ON_ONCE(flags & NVME_IOCTL_VEC))
 -                      return -EINVAL;
 +              if (WARN_ON_ONCE(flags & NVME_IOCTL_VEC)) {
 +                      ret = -EINVAL;
 +                      goto out;
 +              }
                ret = io_uring_cmd_import_fixed(ubuffer, bufflen,
-                               rq_data_dir(req), &iter, ioucmd);
+                               rq_data_dir(req), &iter, ioucmd,
+                               iou_issue_flags);
                if (ret < 0)
                        goto out;
                ret = blk_rq_map_user_iov(q, req, NULL, &iter, GFP_KERNEL);

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

diff --cc drivers/ufs/host/ufs-qcom.c
Simple merge

diff --cc include/linux/blk-mq.h
Simple merge

diff --cc include/linux/blkdev.h
Simple merge

diff --cc include/linux/wait.h
Simple merge

diff --cc io_uring/rw.c
Simple merge

diff --cc tools/testing/selftests/Makefile
Simple merge

diff --cc tools/testing/selftests/drivers/net/hw/Makefile
index cde5814ff9a75bdb44ced976d764f0be3f44e181,7efc47c8946306244f5204c45b578243bb48ff67..5cac9d6ad28211a7e798f9bcfe8224d83d702ee3
--- 1/tools/testing/selftests/drivers/net/hw/Makefile
--- 2/tools/testing/selftests/drivers/net/hw/Makefile
+++ b/tools/testing/selftests/drivers/net/hw/Makefile
@@@ -10,7 -12,7 +12,8 @@@ TEST_PROGS = 
        ethtool_rmon.sh \
        hw_stats_l3.sh \
        hw_stats_l3_gre.sh \
+       iou-zcrx.py \
 +      irq.py \
        loopback.sh \
        nic_link_layer.py \
        nic_performance.py \
@@@ -43,4 -42,4 +46,6 @@@ include ../../../lib.m
  YNL_GENS := ethtool netdev
  include ../../../net/ynl.mk
  
+ $(OUTPUT)/iou-zcrx: LDLIBS += -luring
++
 +include ../../../net/bpf.mk