Merge tag 'block-6.1-2022-10-13' of git://git.kernel.dk/linux

Pull more block updates from Jens Axboe:
 "Fixes that ended up landing later than the initial block pull request.
  Nothing really major in here:

   - NVMe pull request via Christoph:
        - add NVME_QUIRK_BOGUS_NID for Lexar NM760 (Abhijit)
        - add NVME_QUIRK_NO_DEEPEST_PS to avoid the deepest sleep state
          on ZHITAI TiPro5000 SSDs (Xi Ruoyao)
        - fix possible hang caused during ctrl deletion (Sagi Grimberg)
        - fix possible hang in live ns resize with ANA access (Sagi
          Grimberg)

   - Proactively avoid a sign extension issue with the queue flags
     (Brian)

   - Regression fix for hidden disks (Christoph)

   - Update OPAL maintainers entry (Jonathan)

   - blk-wbt regression initialization fix (Yu)"

* tag 'block-6.1-2022-10-13' of git://git.kernel.dk/linux:
  nvme-multipath: fix possible hang in live ns resize with ANA access
  nvme-pci: avoid the deepest sleep state on ZHITAI TiPro5000 SSDs
  nvme-pci: add NVME_QUIRK_BOGUS_NID for Lexar NM760
  nvme-tcp: fix possible hang caused during ctrl deletion
  nvme-rdma: fix possible hang caused during ctrl deletion
  block: fix leaking minors of hidden disks
  block: avoid sign extend problem with default queue flags mask
  blk-wbt: fix that 'rwb->wc' is always set to 1 in wbt_init()
  block: Remove the repeat word 'can'
  MAINTAINERS: Update SED-Opal Maintainers

diff --combined MAINTAINERS
index fb0a565,1298471..7483853
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -554,7 -554,7 +554,7 @@@ M: Michael Hennerich <michael.hennerich
  S:    Supported
  W:    http://wiki.analog.com/ADP5588
  W:    https://ez.analog.com/linux-software-drivers
 -F:    drivers/gpio/gpio-adp5588.c
 +F:    Documentation/devicetree/bindings/input/adi,adp5588.yaml
  F:    drivers/input/keyboard/adp5588-keys.c
  
  ADP8860 BACKLIGHT DRIVER (ADP8860/ADP8861/ADP8863)
@@@ -1915,7 -1915,6 +1915,7 @@@ F:      drivers/dma/apple-admac.
  F:    drivers/i2c/busses/i2c-pasemi-core.c
  F:    drivers/i2c/busses/i2c-pasemi-platform.c
  F:    drivers/iommu/apple-dart.c
 +F:    drivers/iommu/io-pgtable-dart.c
  F:    drivers/irqchip/irq-apple-aic.c
  F:    drivers/mailbox/apple-mailbox.c
  F:    drivers/nvme/host/apple.c
@@@ -2067,7 -2066,6 +2067,7 @@@ F:      drivers/hwtracing/coresight/
  F:    include/dt-bindings/arm/coresight-cti-dt.h
  F:    include/linux/coresight*
  F:    samples/coresight/*
 +F:    tools/perf/tests/shell/coresight/*
  F:    tools/perf/arch/arm/util/auxtrace.c
  F:    tools/perf/arch/arm/util/cs-etm.c
  F:    tools/perf/arch/arm/util/cs-etm.h
@@@ -3239,13 -3237,6 +3239,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/usb/aspeed,ast2600-udc.yaml
  F:    drivers/usb/gadget/udc/aspeed_udc.c
  
 +ASPEED CRYPTO DRIVER
 +M:    Neal Liu <neal_liu@aspeedtech.com>
 +L:    linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/crypto/aspeed,ast2500-hace.yaml
 +F:    drivers/crypto/aspeed/
 +
  ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
  M:    Corentin Chary <corentin.chary@gmail.com>
  L:    acpi4asus-user@lists.sourceforge.net
@@@ -5171,7 -5162,6 +5171,7 @@@ M:      Steve French <sfrench@samba.org
  R:    Paulo Alcantara <pc@cjr.nz> (DFS, global name space)
  R:    Ronnie Sahlberg <lsahlber@redhat.com> (directory leases, sparse files)
  R:    Shyam Prasad N <sprasad@microsoft.com> (multichannel)
 +R:    Tom Talpey <tom@talpey.com> (RDMA, smbdirect)
  L:    linux-cifs@vger.kernel.org
  L:    samba-technical@lists.samba.org (moderated for non-subscribers)
  S:    Supported
@@@ -5666,12 -5656,6 +5666,12 @@@ Q:    http://patchwork.linuxtv.org/project
  T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/common/cypress_firmware*
  
 +CYPRESS CY8C95X0 PINCTRL DRIVER
 +M:    Patrick Rudolph <patrick.rudolph@9elements.com>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/pinctrl/pinctrl-cy8c95x0.c
 +
  CYPRESS CY8CTMA140 TOUCHSCREEN DRIVER
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-input@vger.kernel.org
@@@ -6179,7 -6163,6 +6179,7 @@@ F:      include/asm-generic/dma-mapping.
  F:    include/linux/dma-direct.h
  F:    include/linux/dma-mapping.h
  F:    include/linux/dma-map-ops.h
 +F:    include/linux/swiotlb.h
  F:    kernel/dma/
  
  DMA MAPPING BENCHMARK
@@@ -8450,19 -8433,6 +8450,19 @@@ L:    platform-driver-x86@vger.kernel.or
  S:    Maintained
  F:    drivers/platform/x86/fujitsu-tablet.c
  
 +FUNCTION HOOKS (FTRACE)
 +M:    Steven Rostedt <rostedt@goodmis.org>
 +M:    Masami Hiramatsu <mhiramat@kernel.org>
 +R:    Mark Rutland <mark.rutland@arm.com>
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
 +F:    Documentation/trace/ftrace*
 +F:    kernel/trace/ftrace*
 +F:    kernel/trace/fgraph.c
 +F:    arch/*/*/*/*ftrace*
 +F:    arch/*/*/*ftrace*
 +F:    include/*/ftrace.h
 +
  FUNGIBLE ETHERNET DRIVERS
  M:    Dimitris Michailidis <dmichail@fungible.com>
  L:    netdev@vger.kernel.org
@@@ -9720,13 -9690,6 +9720,13 @@@ S:    Orpha
  F:    Documentation/ia64/
  F:    arch/ia64/
  
 +IBM Operation Panel Input Driver
 +M:    Eddie James <eajames@linux.ibm.com>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/input/ibm,op-panel.yaml
 +F:    drivers/input/misc/ibm-panel.c
 +
  IBM Power 842 compression accelerator
  M:    Haren Myneni <haren@us.ibm.com>
  S:    Supported
@@@ -10706,8 -10669,8 +10706,8 @@@ L:   iommu@lists.linux.de
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
  F:    drivers/iommu/dma-iommu.c
 +F:    drivers/iommu/dma-iommu.h
  F:    drivers/iommu/iova.c
 -F:    include/linux/dma-iommu.h
  F:    include/linux/iova.h
  
  IOMMU SUBSYSTEM
@@@ -11019,6 -10982,7 +11019,6 @@@ F:   arch/*/include/asm/*kasan.
  F:    arch/*/mm/kasan_init*
  F:    include/linux/kasan*.h
  F:    lib/Kconfig.kasan
 -F:    lib/test_kasan*.c
  F:    mm/kasan/
  F:    scripts/Makefile.kasan
  
@@@ -11204,8 -11168,7 +11204,8 @@@ R:   Alexandru Elisei <alexandru.elisei@a
  R:    Suzuki K Poulose <suzuki.poulose@arm.com>
  R:    Oliver Upton <oliver.upton@linux.dev>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -L:    kvmarm@lists.cs.columbia.edu (moderated for non-subscribers)
 +L:    kvmarm@lists.linux.dev
 +L:    kvmarm@lists.cs.columbia.edu (deprecated, moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
  F:    arch/arm64/include/asm/kvm*
@@@ -11453,27 -11416,13 +11453,27 @@@ F:        kernel/kmod.
  F:    lib/test_kmod.c
  F:    tools/testing/selftests/kmod/
  
 +KMSAN
 +M:    Alexander Potapenko <glider@google.com>
 +R:    Marco Elver <elver@google.com>
 +R:    Dmitry Vyukov <dvyukov@google.com>
 +L:    kasan-dev@googlegroups.com
 +S:    Maintained
 +F:    Documentation/dev-tools/kmsan.rst
 +F:    arch/*/include/asm/kmsan.h
 +F:    arch/*/mm/kmsan_*
 +F:    include/linux/kmsan*.h
 +F:    lib/Kconfig.kmsan
 +F:    mm/kmsan/
 +F:    scripts/Makefile.kmsan
 +
  KPROBES
  M:    Naveen N. Rao <naveen.n.rao@linux.ibm.com>
  M:    Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
  M:    "David S. Miller" <davem@davemloft.net>
  M:    Masami Hiramatsu <mhiramat@kernel.org>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
  F:    Documentation/trace/kprobes.rst
  F:    include/asm-generic/kprobes.h
  F:    include/linux/kprobes.h
@@@ -12197,18 -12146,6 +12197,18 @@@ L: linux-man@vger.kernel.or
  S:    Maintained
  W:    http://www.kernel.org/doc/man-pages
  
 +MAPLE TREE
 +M:    Liam R. Howlett <Liam.Howlett@oracle.com>
 +L:    linux-mm@kvack.org
 +S:    Supported
 +F:    Documentation/core-api/maple_tree.rst
 +F:    include/linux/maple_tree.h
 +F:    include/trace/events/maple_tree.h
 +F:    lib/maple_tree.c
 +F:    lib/test_maple_tree.c
 +F:    tools/testing/radix-tree/linux/maple_tree.h
 +F:    tools/testing/radix-tree/maple.c
 +
  MARDUK (CREATOR CI40) DEVICE TREE SUPPORT
  M:    Rahul Bedarkar <rahulbedarkar89@gmail.com>
  L:    linux-mips@vger.kernel.org
@@@ -12940,12 -12877,6 +12940,12 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/media/mediatek-jpeg-*.yaml
  F:    drivers/media/platform/mediatek/jpeg/
  
 +MEDIATEK KEYPAD DRIVER
 +M:    Mattijs Korpershoek <mkorpershoek@baylibre.com>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml
 +F:    drivers/input/keyboard/mt6779-keypad.c
 +
  MEDIATEK MDP DRIVER
  M:    Minghsiu Tsai <minghsiu.tsai@mediatek.com>
  M:    Houlong Wei <houlong.wei@mediatek.com>
@@@ -12998,7 -12929,7 +12998,7 @@@ MEDIATEK MT7621/28/88 I2C DRIVE
  M:    Stefan Roese <sr@denx.de>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-mt7621.txt
 +F:    Documentation/devicetree/bindings/i2c/mediatek,mt7621-i2c.yaml
  F:    drivers/i2c/busses/i2c-mt7621.c
  
  MEDIATEK MT7621 PCIE CONTROLLER DRIVER
@@@ -15359,6 -15290,17 +15359,6 @@@ L:  linux-rdma@vger.kernel.or
  S:    Supported
  F:    drivers/infiniband/ulp/opa_vnic
  
 -OPEN FIRMWARE AND DEVICE TREE OVERLAYS
 -M:    Pantelis Antoniou <pantelis.antoniou@konsulko.com>
 -M:    Frank Rowand <frowand.list@gmail.com>
 -L:    devicetree@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/devicetree/dynamic-resolution-notes.rst
 -F:    Documentation/devicetree/overlay-notes.rst
 -F:    drivers/of/overlay.c
 -F:    drivers/of/resolver.c
 -K:    of_overlay_notifier_
 -
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Rob Herring <robh+dt@kernel.org>
  M:    Frank Rowand <frowand.list@gmail.com>
@@@ -15371,9 -15313,6 +15371,9 @@@ F:   Documentation/ABI/testing/sysfs-firm
  F:    drivers/of/
  F:    include/linux/of*.h
  F:    scripts/dtc/
 +K:    of_overlay_notifier_
 +K:    of_overlay_fdt_apply
 +K:    of_overlay_remove
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
  M:    Rob Herring <robh+dt@kernel.org>
@@@ -15859,7 -15798,6 +15859,7 @@@ PCI ENDPOINT SUBSYSTE
  M:    Kishon Vijay Abraham I <kishon@ti.com>
  M:    Lorenzo Pieralisi <lpieralisi@kernel.org>
  R:    Krzysztof Wilczyński <kw@linux.com>
 +R:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  L:    linux-pci@vger.kernel.org
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-pci/list/
@@@ -15873,8 -15811,8 +15873,8 @@@ F:   drivers/pci/endpoint
  F:    tools/pci/
  
  PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC
 -M:    Russell Currey <ruscur@russell.cc>
 -M:    Oliver O'Halloran <oohall@gmail.com>
 +M:    Mahesh J Salgaonkar <mahesh@linux.ibm.com>
 +R:    Oliver O'Halloran <oohall@gmail.com>
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
  F:    Documentation/PCI/pci-error-recovery.rst
@@@ -16351,12 -16289,6 +16351,12 @@@ F: Documentation/devicetree/bindings/pi
  F:    drivers/pinctrl/sunplus/
  F:    include/dt-bindings/pinctrl/sppctl*.h
  
 +PINE64 PINEPHONE KEYBOARD DRIVER
 +M:    Samuel Holland <samuel@sholland.org>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/input/pine64,pinephone-keyboard.yaml
 +F:    drivers/input/keyboard/pinephone-keyboard.c
 +
  PKTCDVD DRIVER
  M:    linux-block@vger.kernel.org
  S:    Orphan
@@@ -17042,7 -16974,7 +17042,7 @@@ M:   Srinivas Kandagatla <srinivas.kandag
  M:    Amol Maheshwari <amahesh@qti.qualcomm.com>
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/misc/qcom,fastrpc.txt
 +F:    Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
  F:    drivers/misc/fastrpc.c
  F:    include/uapi/misc/fastrpc.h
  
@@@ -18515,8 -18447,7 +18515,7 @@@ S:   Maintaine
  F:    drivers/mmc/host/sdhci-esdhc-imx.c
  
  SECURE ENCRYPTING DEVICE (SED) OPAL DRIVER
- M:    Jonathan Derrick <jonathan.derrick@intel.com>
- M:    Revanth Rajashekar <revanth.rajashekar@intel.com>
+ M:    Jonathan Derrick <jonathan.derrick@linux.dev>
  L:    linux-block@vger.kernel.org
  S:    Supported
  F:    block/opal_proto.h
@@@ -18662,7 -18593,6 +18661,7 @@@ F:   drivers/misc/sgi-xp
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
  M:    Karsten Graul <kgraul@linux.ibm.com>
  M:    Wenjia Zhang <wenjia@linux.ibm.com>
 +M:    Jan Karcher <jaka@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -19608,8 -19538,8 +19607,8 @@@ M:   Emil Renner Berthing <kernel@esmil.d
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
 -F:    drivers/pinctrl/pinctrl-starfive.c
 -F:    include/dt-bindings/pinctrl/pinctrl-starfive.h
 +F:    drivers/pinctrl/starfive/
 +F:    include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
  
  STARFIVE JH7100 RESET CONTROLLER DRIVER
  M:    Emil Renner Berthing <kernel@esmil.dk>
@@@ -19797,6 -19727,16 +19796,6 @@@ S:  Maintaine
  F:    Documentation/admin-guide/svga.rst
  F:    arch/x86/boot/video*
  
 -SWIOTLB SUBSYSTEM
 -M:    Christoph Hellwig <hch@infradead.org>
 -L:    iommu@lists.linux.dev
 -S:    Supported
 -W:    http://git.infradead.org/users/hch/dma-mapping.git
 -T:    git git://git.infradead.org/users/hch/dma-mapping.git
 -F:    arch/*/kernel/pci-swiotlb.c
 -F:    include/linux/swiotlb.h
 -F:    kernel/dma/swiotlb.c
 -
  SWITCHDEV
  M:    Jiri Pirko <jiri@resnulli.us>
  M:    Ivan Vecera <ivecera@redhat.com>
@@@ -20830,11 -20770,14 +20829,11 @@@ F:        drivers/hwmon/pmbus/tps546d24.
  
  TRACING
  M:    Steven Rostedt <rostedt@goodmis.org>
 -M:    Ingo Molnar <mingo@redhat.com>
 +M:    Masami Hiramatsu <mhiramat@kernel.org>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
 -F:    Documentation/trace/ftrace.rst
 -F:    arch/*/*/*/*ftrace*
 -F:    arch/*/*/*ftrace*
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
 +F:    Documentation/trace/*
  F:    fs/tracefs/
 -F:    include/*/ftrace.h
  F:    include/linux/trace*.h
  F:    include/trace/
  F:    kernel/trace/
@@@ -20843,7 -20786,7 +20842,7 @@@ F:   tools/testing/selftests/ftrace
  
  TRACING MMIO ACCESSES (MMIOTRACE)
  M:    Steven Rostedt <rostedt@goodmis.org>
 -M:    Ingo Molnar <mingo@kernel.org>
 +M:    Masami Hiramatsu <mhiramat@kernel.org>
  R:    Karol Herbst <karolherbst@gmail.com>
  R:    Pekka Paalanen <ppaalanen@gmail.com>
  L:    linux-kernel@vger.kernel.org
@@@ -21551,7 -21494,6 +21550,7 @@@ R:   Cornelia Huck <cohuck@redhat.com
  L:    kvm@vger.kernel.org
  S:    Maintained
  T:    git git://github.com/awilliam/linux-vfio.git
 +F:    Documentation/ABI/testing/sysfs-devices-vfio-dev
  F:    Documentation/driver-api/vfio.rst
  F:    drivers/vfio/
  F:    include/linux/vfio.h
@@@ -21732,10 -21674,6 +21731,10 @@@ F: include/linux/virtio*.
  F:    include/uapi/linux/virtio_*.h
  F:    tools/virtio/
  
 +IFCVF VIRTIO DATA PATH ACCELERATOR
 +R:    Zhu Lingshan <lingshan.zhu@intel.com>
 +F:    drivers/vdpa/ifcvf/
 +
  VIRTIO BALLOON
  M:    "Michael S. Tsirkin" <mst@redhat.com>
  M:    David Hildenbrand <david@redhat.com>
@@@ -22518,10 -22456,8 +22517,10 @@@ M: Stefano Stabellini <sstabellini@kern
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  L:    iommu@lists.linux.dev
  S:    Supported
 -F:    arch/x86/xen/*swiotlb*
 -F:    drivers/xen/*swiotlb*
 +F:    arch/*/include/asm/xen/swiotlb-xen.h
 +F:    drivers/xen/swiotlb-xen.c
 +F:    include/xen/arm/swiotlb-xen.h
 +F:    include/xen/swiotlb-xen.h
  
  XFS FILESYSTEM
  C:    irc://irc.oftc.net/xfs

diff --combined block/bio.c
index ec350e0,6c470a5..633a902
--- 1/block/bio.c
--- 2/block/bio.c
+++ b/block/bio.c
@@@ -567,7 -567,7 +567,7 @@@ EXPORT_SYMBOL(bio_alloc_bioset)
   * be reused by calling bio_uninit() before calling bio_init() again.
   *
   * Note that unlike bio_alloc() or bio_alloc_bioset() allocations from this
-  * function are not backed by a mempool can can fail.  Do not use this function
+  * function are not backed by a mempool can fail.  Do not use this function
   * for allocations in the file system I/O path.
   *
   * Returns: Pointer to new bio on success, NULL on failure.
@@@ -867,8 -867,6 +867,8 @@@ static inline bool page_is_mergeable(co
        *same_page = ((vec_end_addr & PAGE_MASK) == page_addr);
        if (*same_page)
                return true;
 +      else if (IS_ENABLED(CONFIG_KMSAN))
 +              return false;
        return (bv->bv_page + bv_end / PAGE_SIZE) == (page + off / PAGE_SIZE);
  }