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

Pull block fixes from Jens Axboe:

 - NVMe pull request via Christoph:
      - fix nvme-hwmon for DMA non-cohehrent architectures (Serge Semin)
      - add a nvme-hwmong maintainer (Christoph Hellwig)
      - fix error pointer dereference in error handling (Dan Carpenter)
      - fix invalid memory reference in nvmet_subsys_attr_qid_max_show
        (Daniel Wagner)
      - don't limit the DMA segment size in nvme-apple (Russell King)
      - fix workqueue MEM_RECLAIM flushing dependency (Sagi Grimberg)
      - disable write zeroes on various Kingston SSDs (Xander Li)

 - fix a memory leak with block device tracing (Ye)

 - flexible-array fix for ublk (Yushan)

 - document the ublk recovery feature from this merge window
   (ZiyangZhang)

 - remove dead bfq variable in struct (Yuwei)

 - error handling rq clearing fix (Yu)

 - add an IRQ safety check for the cached bio freeing (Pavel)

 - drbd bio cloning fix (Christoph)

* tag 'block-6.1-2022-10-20' of git://git.kernel.dk/linux:
  blktrace: remove unnessary stop block trace in 'blk_trace_shutdown'
  blktrace: fix possible memleak in '__blk_trace_remove'
  blktrace: introduce 'blk_trace_{start,stop}' helper
  bio: safeguard REQ_ALLOC_CACHE bio put
  block, bfq: remove unused variable for bfq_queue
  drbd: only clone bio if we have a backing device
  ublk_drv: use flexible-array member instead of zero-length array
  nvmet: fix invalid memory reference in nvmet_subsys_attr_qid_max_show
  nvmet: fix workqueue MEM_RECLAIM flushing dependency
  nvme-hwmon: kmalloc the NVME SMART log buffer
  nvme-hwmon: consistently ignore errors from nvme_hwmon_init
  nvme: add Guenther as nvme-hwmon maintainer
  nvme-apple: don't limit DMA segement size
  nvme-pci: disable write zeroes on various Kingston SSD
  nvme: fix error pointer dereference in error handling
  Documentation: document ublk user recovery feature
  blk-mq: fix null pointer dereference in blk_mq_clear_rq_mapping()

diff --combined MAINTAINERS
index 8904f186c83b089606beb298dc6fe41f537d211e,fde92782fbbdf540d67ece3ef42c5675896a9e33..bdd43abd26835d092e8692f1b26f3c0a3b4f41a5
--- 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)
@@@ -752,7 -752,7 +752,7 @@@ ALIBABA PMU DRIVE
  M:    Shuai Xue <xueshuai@linux.alibaba.com>
  S:    Supported
  F:    Documentation/admin-guide/perf/alibaba_pmu.rst
 -F:    drivers/perf/alibaba_uncore_dwr_pmu.c
 +F:    drivers/perf/alibaba_uncore_drw_pmu.c
  
  ALIENWARE WMI DRIVER
  L:    Dell.Client.Kernel@dell.com
@@@ -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
@@@ -4459,15 -4450,13 +4459,15 @@@ M:   Josef Bacik <josef@toxicpanda.com
  M:    David Sterba <dsterba@suse.com>
  L:    linux-btrfs@vger.kernel.org
  S:    Maintained
 -W:    http://btrfs.wiki.kernel.org/
 -Q:    http://patchwork.kernel.org/project/linux-btrfs/list/
 +W:    https://btrfs.readthedocs.io
 +W:    https://btrfs.wiki.kernel.org/
 +Q:    https://patchwork.kernel.org/project/linux-btrfs/list/
  C:    irc://irc.libera.chat/btrfs
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git
  F:    Documentation/filesystems/btrfs.rst
  F:    fs/btrfs/
  F:    include/linux/btrfs*
 +F:    include/trace/events/btrfs.h
  F:    include/uapi/linux/btrfs*
  
  BTTV VIDEO4LINUX DRIVER
@@@ -5173,7 -5162,6 +5173,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
@@@ -5268,7 -5256,6 +5268,7 @@@ F:      tools/testing/selftests/cgroup
  
  CONTROL GROUP - BLOCK IO CONTROLLER (BLKIO)
  M:    Tejun Heo <tj@kernel.org>
 +M:    Josef Bacik <josef@toxicpanda.com>
  M:    Jens Axboe <axboe@kernel.dk>
  L:    cgroups@vger.kernel.org
  L:    linux-block@vger.kernel.org
@@@ -5276,7 -5263,6 +5276,7 @@@ T:      git git://git.kernel.dk/linux-bloc
  F:    Documentation/admin-guide/cgroup-v1/blkio-controller.rst
  F:    block/bfq-cgroup.c
  F:    block/blk-cgroup.c
 +F:    block/blk-iocost.c
  F:    block/blk-iolatency.c
  F:    block/blk-throttle.c
  F:    include/linux/blk-cgroup.h
@@@ -5670,12 -5656,6 +5670,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
@@@ -6183,7 -6163,6 +6183,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
@@@ -8454,19 -8433,6 +8454,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
@@@ -9724,13 -9690,6 +9724,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
@@@ -10710,8 -10669,8 +10710,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
@@@ -11023,6 -10982,7 +11023,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
  
@@@ -11208,8 -11168,7 +11208,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*
@@@ -11457,27 -11416,13 +11457,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
@@@ -12201,18 -12146,6 +12201,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
@@@ -12944,12 -12877,6 +12944,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>
@@@ -13002,7 -12929,7 +13002,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
@@@ -14713,6 -14640,12 +14713,12 @@@ F: drivers/nvme/target/auth.
  F:    drivers/nvme/target/fabrics-cmd-auth.c
  F:    include/linux/nvme-auth.h
  
+ NVM EXPRESS HARDWARE MONITORING SUPPORT
+ M:    Guenter Roeck <linux@roeck-us.net>
+ L:    linux-nvme@lists.infradead.org
+ S:    Supported
+ F:    drivers/nvme/host/hwmon.c
+ 
  NVM EXPRESS FC TRANSPORT DRIVERS
  M:    James Smart <james.smart@broadcom.com>
  L:    linux-nvme@lists.infradead.org
@@@ -15363,6 -15296,17 +15369,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>
@@@ -15375,9 -15319,6 +15381,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>
@@@ -15415,7 -15356,7 +15421,7 @@@ M:   Stafford Horne <shorne@gmail.com
  L:    openrisc@lists.librecores.org
  S:    Maintained
  W:    http://openrisc.io
 -T:    git git://github.com/openrisc/linux.git
 +T:    git https://github.com/openrisc/linux.git
  F:    Documentation/devicetree/bindings/openrisc/
  F:    Documentation/openrisc/
  F:    arch/openrisc/
@@@ -15863,7 -15804,6 +15869,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/
@@@ -15877,8 -15817,8 +15883,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
@@@ -16355,12 -16295,6 +16361,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
@@@ -17046,7 -16980,7 +17052,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
  
@@@ -17706,7 -17640,6 +17712,7 @@@ M:   Palmer Dabbelt <palmer@dabbelt.com
  M:    Albert Ou <aou@eecs.berkeley.edu>
  L:    linux-riscv@lists.infradead.org
  S:    Supported
 +Q:    https://patchwork.kernel.org/project/linux-riscv/list/
  P:    Documentation/riscv/patch-acceptance.rst
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
  F:    arch/riscv/
@@@ -17718,13 -17651,12 +17724,13 @@@ M:        Conor Dooley <conor.dooley@microchip
  M:    Daire McNamara <daire.mcnamara@microchip.com>
  L:    linux-riscv@lists.infradead.org
  S:    Supported
 -F:    Documentation/devicetree/bindings/clock/microchip,mpfs.yaml
 +F:    Documentation/devicetree/bindings/clock/microchip,mpfs*.yaml
  F:    Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml
  F:    Documentation/devicetree/bindings/i2c/microchip,corei2c.yaml
  F:    Documentation/devicetree/bindings/mailbox/microchip,mpfs-mailbox.yaml
  F:    Documentation/devicetree/bindings/net/can/microchip,mpfs-can.yaml
  F:    Documentation/devicetree/bindings/pwm/microchip,corepwm.yaml
 +F:    Documentation/devicetree/bindings/riscv/microchip.yaml
  F:    Documentation/devicetree/bindings/soc/microchip/microchip,mpfs-sys-controller.yaml
  F:    Documentation/devicetree/bindings/spi/microchip,mpfs-spi.yaml
  F:    Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml
@@@ -18215,6 -18147,7 +18221,6 @@@ F:   include/media/drv-intf/s3c_camif.
  
  SAMSUNG S3FWRN5 NFC DRIVER
  M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 -M:    Krzysztof Opasiak <k.opasiak@samsung.com>
  L:    linux-nfc@lists.01.org (subscribers-only)
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
@@@ -18666,7 -18599,6 +18672,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/
@@@ -19612,8 -19544,8 +19618,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>
@@@ -19801,6 -19733,16 +19807,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>
@@@ -20834,11 -20776,14 +20840,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/
@@@ -20847,7 -20792,7 +20853,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
@@@ -21296,7 -21241,7 +21302,7 @@@ L:   linux-usb@vger.kernel.or
  L:    netdev@vger.kernel.org
  S:    Maintained
  W:    https://github.com/petkan/pegasus
 -T:    git git://github.com/petkan/pegasus.git
 +T:    git https://github.com/petkan/pegasus.git
  F:    drivers/net/usb/pegasus.*
  
  USB PHY LAYER
@@@ -21333,7 -21278,7 +21339,7 @@@ L:   linux-usb@vger.kernel.or
  L:    netdev@vger.kernel.org
  S:    Maintained
  W:    https://github.com/petkan/rtl8150
 -T:    git git://github.com/petkan/rtl8150.git
 +T:    git https://github.com/petkan/rtl8150.git
  F:    drivers/net/usb/rtl8150.c
  
  USB SERIAL SUBSYSTEM
@@@ -21555,7 -21500,6 +21561,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
@@@ -21736,10 -21680,6 +21742,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>
@@@ -22124,7 -22064,6 +22130,7 @@@ F:   Documentation/watchdog
  F:    drivers/watchdog/
  F:    include/linux/watchdog.h
  F:    include/uapi/linux/watchdog.h
 +F:    include/trace/events/watchdog.h
  
  WHISKEYCOVE PMIC GPIO DRIVER
  M:    Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
@@@ -22523,10 -22462,8 +22529,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 633a902468ec7f10f91f18edb5e6e083eb3f6652,0a14af92373819d6ed25e332ae91c67720d36db9..57c2f327225bd13da2cc00506aeeb2986d13b637
--- 1/block/bio.c
--- 2/block/bio.c
+++ b/block/bio.c
@@@ -741,7 -741,7 +741,7 @@@ void bio_put(struct bio *bio
                        return;
        }
  
-       if (bio->bi_opf & REQ_ALLOC_CACHE) {
+       if ((bio->bi_opf & REQ_ALLOC_CACHE) && !WARN_ON_ONCE(in_interrupt())) {
                struct bio_alloc_cache *cache;
  
                bio_uninit(bio);
@@@ -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);
  }