Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...

Pull RCU and LKMM commits from Paul E. McKenney:

 - An LKMM commit adding support for synchronize_srcu_expedited()
 - A couple of straggling RCU flavor consolidation updates
 - Documentation updates.
 - Miscellaneous fixes
 - SRCU updates
 - RCU CPU stall-warning updates
 - Torture-test updates

Signed-off-by: Ingo Molnar <[email protected]>

diff --combined MAINTAINERS
index d18b4d62cc21b96f4e0bba0ba4b17c50af167b72,a9b5270d006e6314f3edfc014b756f4be12c9927..fe6f13766aebe8f86947b24d563d1ca3dbecf6d0
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1893,15 -1893,14 +1893,15 @@@ T:   git git://git.kernel.org/pub/scm/lin
  ARM/NUVOTON NPCM ARCHITECTURE
  M:    Avi Fishman <[email protected]>
  M:    Tomer Maimon <[email protected]>
 +M:    Tali Perry <[email protected]>
  R:    Patrick Venture <[email protected]>
  R:    Nancy Yuen <[email protected]>
 -R:    Brendan Higgins <brendanhiggins@google.com>
 +R:    Benjamin Fair <benjaminfair@google.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    arch/arm/mach-npcm/
  F:    arch/arm/boot/dts/nuvoton-npcm*
 -F:    include/dt-bindings/clock/nuvoton,npcm7xx-clks.h
 +F:    include/dt-bindings/clock/nuvoton,npcm7xx-clock.h
  F:    drivers/*/*npcm*
  F:    Documentation/devicetree/bindings/*/*npcm*
  F:    Documentation/devicetree/bindings/*/*/*npcm*
@@@ -2357,7 -2356,7 +2357,7 @@@ F:      arch/arm/mm/cache-uniphier.
  F:    arch/arm64/boot/dts/socionext/uniphier*
  F:    drivers/bus/uniphier-system-bus.c
  F:    drivers/clk/uniphier/
 -F:    drivers/dmaengine/uniphier-mdmac.c
 +F:    drivers/dma/uniphier-mdmac.c
  F:    drivers/gpio/gpio-uniphier.c
  F:    drivers/i2c/busses/i2c-uniphier*
  F:    drivers/irqchip/irq-uniphier-aidet.c
@@@ -4130,7 -4129,7 +4130,7 @@@ F:      drivers/cpuidle/
  F:    include/linux/cpuidle.h
  
  CRAMFS FILESYSTEM
 -M:    Nicolas Pitre <nico@linaro.org>
 +M:    Nicolas Pitre <nico@fluxnic.net>
  S:    Maintained
  F:    Documentation/filesystems/cramfs.txt
  F:    fs/cramfs/
@@@ -5834,7 -5833,7 +5834,7 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-mdio
  F:    Documentation/devicetree/bindings/net/mdio*
 -F:    Documentation/networking/phy.txt
 +F:    Documentation/networking/phy.rst
  F:    drivers/net/phy/
  F:    drivers/of/of_mdio.c
  F:    drivers/of/of_net.c
@@@ -6409,6 -6408,7 +6409,6 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
  S:    Maintained
  F:    kernel/futex.c
 -F:    kernel/futex_compat.c
  F:    include/asm-generic/futex.h
  F:    include/linux/futex.h
  F:    include/uapi/linux/futex.h
@@@ -7516,7 -7516,7 +7516,7 @@@ F:      include/net/mac802154.
  F:    include/net/af_ieee802154.h
  F:    include/net/cfg802154.h
  F:    include/net/ieee802154_netdev.h
 -F:    Documentation/networking/ieee802154.txt
 +F:    Documentation/networking/ieee802154.rst
  
  IFE PROTOCOL
  M:    Yotam Gigi <[email protected]>
@@@ -8096,16 -8096,6 +8096,16 @@@ F:    include/linux/iommu.
  F:    include/linux/of_iommu.h
  F:    include/linux/iova.h
  
 +IO_URING
 +M:    Jens Axboe <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://git.kernel.dk/linux-block
 +T:    git git://git.kernel.dk/liburing
 +S:    Maintained
 +F:    fs/io_uring.c
 +F:    include/uapi/linux/io_uring.h
 +
  IP MASQUERADING
  M:    Juanjo Ciarlante <[email protected]>
  S:    Maintained
@@@ -8993,7 -8983,7 +8993,7 @@@ R:      Daniel Lustig <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    tools/memory-model/
  F:    Documentation/atomic_bitops.txt
  F:    Documentation/atomic_t.txt
@@@ -10145,7 -10135,7 +10145,7 @@@ F:   drivers/spi/spi-at91-usart.
  F:    Documentation/devicetree/bindings/mfd/atmel-usart.txt
  
  MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
 -M:    Woojung Huh <Woojung.H[email protected]>
 +M:    Woojung Huh <woojung.h[email protected]>
  M:    Microchip Linux Driver Support <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -13041,9 -13031,9 +13041,9 @@@ M:   Josh Triplett <[email protected]
  R:    Steven Rostedt <[email protected]>
  R:    Mathieu Desnoyers <[email protected]>
  R:    Lai Jiangshan <[email protected]>
- L:    linux-kernel@vger.kernel.org
+ L:    rcu@vger.kernel.org
  S:    Supported
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    tools/testing/selftests/rcutorture
  
  RDC R-321X SoC
@@@ -13089,10 -13079,10 +13089,10 @@@ R:        Steven Rostedt <[email protected]
  R:    Mathieu Desnoyers <[email protected]>
  R:    Lai Jiangshan <[email protected]>
  R:    Joel Fernandes <[email protected]>
- L:    linux-kernel@vger.kernel.org
+ L:    rcu@vger.kernel.org
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    Documentation/RCU/
  X:    Documentation/RCU/torture.txt
  F:    include/linux/rcu*
@@@ -13982,7 -13972,7 +13982,7 @@@ F:   drivers/media/rc/serial_ir.
  SFC NETWORK DRIVER
  M:    Solarflare linux maintainers <[email protected]>
  M:    Edward Cree <[email protected]>
 -M:    Bert Kenward <bkenward@solarflare.com>
 +M:    Martin Habets <mhabets@solarflare.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/sfc/
@@@ -14244,10 -14234,10 +14244,10 @@@ M:        "Paul E. McKenney" <[email protected]
  M:    Josh Triplett <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Mathieu Desnoyers <[email protected]>
- L:    linux-kernel@vger.kernel.org
+ L:    rcu@vger.kernel.org
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    include/linux/srcu*.h
  F:    kernel/rcu/srcu*.c
  
@@@ -15694,7 -15684,7 +15694,7 @@@ M:   "Paul E. McKenney" <[email protected]
  M:    Josh Triplett <[email protected]>
  L:    [email protected]
  S:    Supported
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    Documentation/RCU/torture.txt
  F:    kernel/torture.c
  F:    kernel/rcu/rcutorture.c
@@@ -16509,7 -16499,7 +16509,7 @@@ F:   drivers/char/virtio_console.
  F:    include/linux/virtio_console.h
  F:    include/uapi/linux/virtio_console.h
  
 -VIRTIO CORE, NET AND BLOCK DRIVERS
 +VIRTIO CORE AND NET DRIVERS
  M:    "Michael S. Tsirkin" <[email protected]>
  M:    Jason Wang <[email protected]>
  L:    [email protected]
@@@ -16524,19 -16514,6 +16524,19 @@@ F: include/uapi/linux/virtio_*.
  F:    drivers/crypto/virtio/
  F:    mm/balloon_compaction.c
  
 +VIRTIO BLOCK AND SCSI DRIVERS
 +M:    "Michael S. Tsirkin" <[email protected]>
 +M:    Jason Wang <[email protected]>
 +R:    Paolo Bonzini <[email protected]>
 +R:    Stefan Hajnoczi <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/block/virtio_blk.c
 +F:    drivers/scsi/virtio_scsi.c
 +F:    include/uapi/linux/virtio_blk.h
 +F:    include/uapi/linux/virtio_scsi.h
 +F:    drivers/vhost/scsi.c
 +
  VIRTIO CRYPTO DRIVER
  M:    Gonglei <[email protected]>
  L:    [email protected]

diff --combined drivers/nvme/host/core.c
index 2c43e12b70afccfb424e62d5099339e5056173e9,739c5b4830d703390295a6b088f05bde7c14da67..6265d9225ec8f783c02bb30c5d0048787f18b67f
--- 1/drivers/nvme/host/core.c
--- 2/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@@ -288,7 -288,7 +288,7 @@@ bool nvme_cancel_request(struct reques
                                "Cancelling I/O %d", req->tag);
  
        nvme_req(req)->status = NVME_SC_ABORT_REQ;
 -      blk_mq_complete_request(req);
 +      blk_mq_complete_request_sync(req);
        return true;
  }
  EXPORT_SYMBOL_GPL(nvme_cancel_request);
@@@ -388,7 -388,7 +388,7 @@@ static void nvme_free_ns_head(struct kr
        nvme_mpath_remove_disk(head);
        ida_simple_remove(&head->subsys->ns_ida, head->instance);
        list_del_init(&head->entry);
-       cleanup_srcu_struct_quiesced(&head->srcu);
+       cleanup_srcu_struct(&head->srcu);
        nvme_put_subsystem(head->subsys);
        kfree(head);
  }