Merge tag 'block-5.15-2021-09-11' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Sep 2021 17:19:51 +0000 (10:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Sep 2021 17:19:51 +0000 (10:19 -0700)
Pull block fixes from Jens Axboe:

 - NVMe pull request from Christoph:
     - fix nvmet command set reporting for passthrough controllers (Adam Manzanares)
     - update a MAINTAINERS email address (Chaitanya Kulkarni)
     - set QUEUE_FLAG_NOWAIT for nvme-multipth (me)
     - handle errors from add_disk() (Luis Chamberlain)
     - update the keep alive interval when kato is modified (Tatsuya Sasaki)
     - fix a buffer overrun in nvmet_subsys_attr_serial (Hannes Reinecke)
     - do not reset transport on data digest errors in nvme-tcp (Daniel Wagner)
     - only call synchronize_srcu when clearing current path (Daniel Wagner)
     - revalidate paths during rescan (Hannes Reinecke)

 - Split out the fs/block_dev into block/fops.c and block/bdev.c, which
   has been long overdue. Do this now before -rc1, to avoid annoying
   conflicts due to this (Christoph)

 - blk-throtl use-after-free fix (Li)

 - Improve plug depth for multi-device plugs, greatly increasing md
   resync performance (Song)

 - blkdev_show() locking fix (Tetsuo)

 - n64cart error check fix (Yang)

* tag 'block-5.15-2021-09-11' of git://git.kernel.dk/linux-block:
  n64cart: fix return value check in n64cart_probe()
  blk-mq: allow 4x BLK_MAX_REQUEST_COUNT at blk_plug for multiple_queues
  block: move fs/block_dev.c to block/bdev.c
  block: split out operations on block special files
  blk-throttle: fix UAF by deleteing timer in blk_throtl_exit()
  block: genhd: don't call blkdev_show() with major_names_lock held
  nvme: update MAINTAINERS email address
  nvme: add error handling support for add_disk()
  nvme: only call synchronize_srcu when clearing current path
  nvme: update keep alive interval when kato is modified
  nvme-tcp: Do not reset transport on data digest errors
  nvmet: fixup buffer overrun in nvmet_subsys_attr_serial()
  nvmet: return bool from nvmet_passthru_ctrl and nvmet_is_passthru_req
  nvmet: looks at the passthrough controller when initializing CAP
  nvme: move nvme_multi_css into nvme.h
  nvme-multipath: revalidate paths during rescan
  nvme-multipath: set QUEUE_FLAG_NOWAIT

1  2 
MAINTAINERS
block/Makefile
block/blk-mq.c
fs/Makefile

diff --combined MAINTAINERS
@@@ -333,7 -333,7 +333,7 @@@ S: Maintaine
  F:    drivers/platform/x86/acer-wmi.c
  
  ACPI
 -M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
 +M:    "Rafael J. Wysocki" <rafael@kernel.org>
  M:    Len Brown <lenb@kernel.org>
  L:    linux-acpi@vger.kernel.org
  S:    Supported
@@@ -354,7 -354,7 +354,7 @@@ F: include/linux/fwnode.
  F:    tools/power/acpi/
  
  ACPI APEI
 -M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
 +M:    "Rafael J. Wysocki" <rafael@kernel.org>
  M:    Len Brown <lenb@kernel.org>
  R:    James Morse <james.morse@arm.com>
  R:    Tony Luck <tony.luck@intel.com>
@@@ -364,6 -364,7 +364,6 @@@ F: drivers/acpi/apei
  
  ACPI COMPONENT ARCHITECTURE (ACPICA)
  M:    Robert Moore <robert.moore@intel.com>
 -M:    Erik Kaneda <erik.kaneda@intel.com>
  M:    "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
  L:    linux-acpi@vger.kernel.org
  L:    devel@acpica.org
@@@ -402,7 -403,7 +402,7 @@@ S: Maintaine
  F:    drivers/platform/x86/i2c-multi-instantiate.c
  
  ACPI PMIC DRIVERS
 -M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
 +M:    "Rafael J. Wysocki" <rafael@kernel.org>
  M:    Len Brown <lenb@kernel.org>
  R:    Andy Shevchenko <andy@kernel.org>
  R:    Mika Westerberg <mika.westerberg@linux.intel.com>
@@@ -797,7 -798,7 +797,7 @@@ F: Documentation/devicetree/bindings/i2
  F:    drivers/i2c/busses/i2c-altera.c
  
  ALTERA MAILBOX DRIVER
 -M:    Ley Foon Tan <ley.foon.tan@intel.com>
 +M:    Joyce Ooi <joyce.ooi@intel.com>
  S:    Maintained
  F:    drivers/mailbox/mailbox-altera.c
  
@@@ -984,12 -985,6 +984,12 @@@ S:       Supporte
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  F:    drivers/gpu/drm/amd/pm/powerplay/
  
 +AMD PTDMA DRIVER
 +M:    Sanjay R Mehta <sanju.mehta@amd.com>
 +L:    dmaengine@vger.kernel.org
 +S:    Maintained
 +F:    drivers/dma/ptdma/
 +
  AMD SEATTLE DEVICE TREE SUPPORT
  M:    Brijesh Singh <brijeshkumar.singh@amd.com>
  M:    Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
@@@ -1273,13 -1268,6 +1273,13 @@@ L:    linux-input@vger.kernel.or
  S:    Odd fixes
  F:    drivers/input/mouse/bcm5974.c
  
 +APPLE DART IOMMU DRIVER
 +M:    Sven Peter <sven@svenpeter.dev>
 +L:    iommu@lists.linux-foundation.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iommu/apple,dart.yaml
 +F:    drivers/iommu/apple-dart.c
 +
  APPLE SMC DRIVER
  M:    Henrik Rydberg <rydberg@bitmath.org>
  L:    linux-hwmon@vger.kernel.org
@@@ -1501,7 -1489,7 +1501,7 @@@ F:      drivers/amba
  F:    include/linux/amba/bus.h
  
  ARM PRIMECELL PL35X NAND CONTROLLER DRIVER
 -M:    Miquel Raynal <miquel.raynal@bootlin.com@bootlin.com>
 +M:    Miquel Raynal <miquel.raynal@bootlin.com>
  M:    Naga Sureshkumar Relli <nagasure@xilinx.com>
  L:    linux-mtd@lists.infradead.org
  S:    Maintained
@@@ -1509,7 -1497,7 +1509,7 @@@ F:      Documentation/devicetree/bindings/mt
  F:    drivers/mtd/nand/raw/pl35x-nand-controller.c
  
  ARM PRIMECELL PL35X SMC DRIVER
 -M:    Miquel Raynal <miquel.raynal@bootlin.com@bootlin.com>
 +M:    Miquel Raynal <miquel.raynal@bootlin.com>
  M:    Naga Sureshkumar Relli <nagasure@xilinx.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -2276,6 -2264,7 +2276,6 @@@ F:      drivers/iio/adc/ab8500-gpadc.
  F:    drivers/mfd/ab8500*
  F:    drivers/mfd/abx500*
  F:    drivers/mfd/db8500*
 -F:    drivers/mfd/dbx500*
  F:    drivers/pinctrl/nomadik/
  F:    drivers/rtc/rtc-ab8500.c
  F:    drivers/rtc/rtc-pl031.c
@@@ -2333,14 -2322,14 +2333,14 @@@ N:   oxna
  
  ARM/PALM TREO SUPPORT
  M:    Tomas Cech <sleep_walker@suse.com>
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  W:    http://hackndev.com
  F:    arch/arm/mach-pxa/palmtreo.*
  
  ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
  M:    Marek Vasut <marek.vasut@gmail.com>
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  W:    http://hackndev.com
  F:    arch/arm/mach-pxa/include/mach/palmld.h
@@@ -2354,7 -2343,7 +2354,7 @@@ F:      arch/arm/mach-pxa/palmtx.
  
  ARM/PALMZ72 SUPPORT
  M:    Sergey Lapin <slapin@ossfans.org>
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  W:    http://hackndev.com
  F:    arch/arm/mach-pxa/palmz72.*
@@@ -2524,7 -2513,7 +2524,7 @@@ N:      s5pv21
  
  ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
  M:    Andrzej Hajda <a.hajda@samsung.com>
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/platform/s5p-g2d/
@@@ -2541,14 -2530,14 +2541,14 @@@ ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPO
  M:    Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
  M:    Jacek Anaszewski <jacek.anaszewski@gmail.com>
  M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/platform/s5p-jpeg/
  
  ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
  M:    Andrzej Hajda <a.hajda@samsung.com>
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/platform/s5p-mfc/
@@@ -2738,13 -2727,11 +2738,13 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/arm/toshiba.yaml
  F:    Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
  F:    Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml
 +F:    Documentation/devicetree/bindings/pci/toshiba,visconti-pcie.yaml
  F:    Documentation/devicetree/bindings/pinctrl/toshiba,tmpv7700-pinctrl.yaml
  F:    Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
  F:    arch/arm64/boot/dts/toshiba/
  F:    drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
  F:    drivers/gpio/gpio-visconti.c
 +F:    drivers/pci/controller/dwc/pcie-visconti.c
  F:    drivers/pinctrl/visconti/
  F:    drivers/watchdog/visconti_wdt.c
  N:    visconti
@@@ -3313,7 -3300,6 +3313,6 @@@ S:      Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  F:    block/
  F:    drivers/block/
- F:    fs/block_dev.c
  F:    include/linux/blk*
  F:    kernel/trace/blktrace.c
  F:    lib/sbitmap.c
@@@ -3567,7 -3553,7 +3566,7 @@@ BROADCOM BCM5301X ARM ARCHITECTUR
  M:    Hauke Mehrtens <hauke@hauke-m.de>
  M:    Rafał Miłecki <zajec5@gmail.com>
  M:    bcm-kernel-feedback-list@broadcom.com
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/bcm470*
  F:    arch/arm/boot/dts/bcm5301*
@@@ -3577,7 -3563,7 +3576,7 @@@ F:      arch/arm/mach-bcm/bcm_5301x.
  BROADCOM BCM53573 ARM ARCHITECTURE
  M:    Rafał Miłecki <rafal@milecki.pl>
  L:    bcm-kernel-feedback-list@broadcom.com
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/bcm47189*
  F:    arch/arm/boot/dts/bcm53573*
@@@ -4531,14 -4517,13 +4530,14 @@@ F:   .clang-forma
  CLANG/LLVM BUILD SUPPORT
  M:    Nathan Chancellor <nathan@kernel.org>
  M:    Nick Desaulniers <ndesaulniers@google.com>
 -L:    clang-built-linux@googlegroups.com
 +L:    llvm@lists.linux.dev
  S:    Supported
  W:    https://clangbuiltlinux.github.io/
  B:    https://github.com/ClangBuiltLinux/linux/issues
  C:    irc://irc.libera.chat/clangbuiltlinux
  F:    Documentation/kbuild/llvm.rst
  F:    include/linux/compiler-clang.h
 +F:    scripts/Makefile.clang
  F:    scripts/clang-tools/
  K:    \b(?i:clang|llvm)\b
  
@@@ -4547,7 -4532,7 +4546,7 @@@ M:      Sami Tolvanen <samitolvanen@google.c
  M:    Kees Cook <keescook@chromium.org>
  R:    Nathan Chancellor <nathan@kernel.org>
  R:    Nick Desaulniers <ndesaulniers@google.com>
 -L:    clang-built-linux@googlegroups.com
 +L:    llvm@lists.linux.dev
  S:    Supported
  B:    https://github.com/ClangBuiltLinux/linux/issues
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/clang/features
@@@ -4826,7 -4811,7 +4825,7 @@@ W:      http://www.arm.com/products/processo
  F:    drivers/cpufreq/vexpress-spc-cpufreq.c
  
  CPU FREQUENCY SCALING FRAMEWORK
 -M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
 +M:    "Rafael J. Wysocki" <rafael@kernel.org>
  M:    Viresh Kumar <viresh.kumar@linaro.org>
  L:    linux-pm@vger.kernel.org
  S:    Maintained
@@@ -4844,7 -4829,7 +4843,7 @@@ F:      kernel/sched/cpufreq*.
  F:    tools/testing/selftests/cpufreq/
  
  CPU IDLE TIME MANAGEMENT FRAMEWORK
 -M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
 +M:    "Rafael J. Wysocki" <rafael@kernel.org>
  M:    Daniel Lezcano <daniel.lezcano@linaro.org>
  L:    linux-pm@vger.kernel.org
  S:    Maintained
@@@ -4873,7 -4858,7 +4872,7 @@@ CPUIDLE DRIVER - ARM BIG LITTL
  M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  M:    Daniel Lezcano <daniel.lezcano@linaro.org>
  L:    linux-pm@vger.kernel.org
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
  F:    drivers/cpuidle/cpuidle-big_little.c
@@@ -4893,14 -4878,14 +4892,14 @@@ CPUIDLE DRIVER - ARM PSC
  M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  M:    Sudeep Holla <sudeep.holla@arm.com>
  L:    linux-pm@vger.kernel.org
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    drivers/cpuidle/cpuidle-psci.c
  
  CPUIDLE DRIVER - ARM PSCI PM DOMAIN
  M:    Ulf Hansson <ulf.hansson@linaro.org>
  L:    linux-pm@vger.kernel.org
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    drivers/cpuidle/cpuidle-psci.h
  F:    drivers/cpuidle/cpuidle-psci-domain.c
@@@ -5154,17 -5139,6 +5153,17 @@@ F:    net/ax25/ax25_out.
  F:    net/ax25/ax25_timer.c
  F:    net/ax25/sysctl_net_ax25.c
  
 +DATA ACCESS MONITOR
 +M:    SeongJae Park <sjpark@amazon.de>
 +L:    linux-mm@kvack.org
 +S:    Maintained
 +F:    Documentation/admin-guide/mm/damon/
 +F:    Documentation/vm/damon/
 +F:    include/linux/damon.h
 +F:    include/trace/events/damon.h
 +F:    mm/damon/
 +F:    tools/testing/selftests/damon/
 +
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
  L:    netdev@vger.kernel.org
  S:    Orphan
@@@ -6871,6 -6845,7 +6870,6 @@@ F:      Documentation/admin-guide/media/em28
  F:    drivers/media/usb/em28xx/
  
  EMBEDDED LINUX
 -M:    Paul Gortmaker <paul.gortmaker@windriver.com>
  M:    Matt Mackall <mpm@selenic.com>
  M:    David Woodhouse <dwmw2@infradead.org>
  L:    linux-embedded@vger.kernel.org
@@@ -7271,7 -7246,7 +7270,7 @@@ F:      tools/firewire
  
  FIRMWARE FRAMEWORK FOR ARMV8-A
  M:    Sudeep Holla <sudeep.holla@arm.com>
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/firmware/arm_ffa/
  F:    include/linux/arm_ffa.h
@@@ -7450,7 -7425,7 +7449,7 @@@ F:      include/linux/platform_data/video-im
  
  FREESCALE IMX DDR PMU DRIVER
  M:    Frank Li <Frank.li@nxp.com>
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/admin-guide/perf/imx-ddr.rst
  F:    Documentation/devicetree/bindings/perf/fsl-imx-ddr.yaml
@@@ -7542,7 -7517,7 +7541,7 @@@ F:      drivers/tty/serial/ucc_uart.
  FREESCALE SOC DRIVERS
  M:    Li Yang <leoyang.li@nxp.com>
  L:    linuxppc-dev@lists.ozlabs.org
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml
  F:    Documentation/devicetree/bindings/soc/fsl/
@@@ -7590,7 -7565,7 +7589,7 @@@ W:      ftp://ftp.openlinux.org/pub/people/h
  F:    fs/freevxfs/
  
  FREEZER
 -M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
 +M:    "Rafael J. Wysocki" <rafael@kernel.org>
  M:    Pavel Machek <pavel@ucw.cz>
  L:    linux-pm@vger.kernel.org
  S:    Supported
@@@ -7843,7 -7818,7 +7842,7 @@@ S:      Supporte
  F:    drivers/i2c/muxes/i2c-demux-pinctrl.c
  
  GENERIC PM DOMAINS
 -M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
 +M:    "Rafael J. Wysocki" <rafael@kernel.org>
  M:    Kevin Hilman <khilman@kernel.org>
  M:    Ulf Hansson <ulf.hansson@linaro.org>
  L:    linux-pm@vger.kernel.org
@@@ -8309,7 -8284,7 +8308,7 @@@ W:      http://drama.obuda.kando.hu/~fero/cg
  F:    drivers/video/fbdev/hgafb.c
  
  HIBERNATION (aka Software Suspend, aka swsusp)
 -M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
 +M:    "Rafael J. Wysocki" <rafael@kernel.org>
  M:    Pavel Machek <pavel@ucw.cz>
  L:    linux-pm@vger.kernel.org
  S:    Supported
@@@ -8470,7 -8445,7 +8469,7 @@@ F:      drivers/crypto/hisilicon/sgl.
  F:    drivers/crypto/hisilicon/zip/
  
  HISILICON ROCE DRIVER
 -M:    Lijun Ou <oulijun@huawei.com>
 +M:    Wenpeng Liang <liangwenpeng@huawei.com>
  M:    Weihang Li <liweihang@huawei.com>
  L:    linux-rdma@vger.kernel.org
  S:    Maintained
@@@ -9293,20 -9268,13 +9292,20 @@@ INTEL ATOMISP2 DUMMY / POWER-MANAGEMEN
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/intel_atomisp2_pm.c
 +F:    drivers/platform/x86/intel/atomisp2/pm.c
  
  INTEL ATOMISP2 LED DRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/intel_atomisp2_led.c
 +F:    drivers/platform/x86/intel/atomisp2/led.c
 +
 +INTEL BIOS SAR INT1092 DRIVER
 +M:    Shravan S <s.shravan@intel.com>
 +M:    Intel Corporation <linuxwwan@intel.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/intel/int1092/
  
  INTEL BROXTON PMC DRIVER
  M:    Mika Westerberg <mika.westerberg@linux.intel.com>
@@@ -9402,7 -9370,7 +9401,7 @@@ INTEL HID EVENT DRIVE
  M:    Alex Hung <alex.hung@canonical.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/intel-hid.c
 +F:    drivers/platform/x86/intel/hid.c
  
  INTEL I/OAT DMA DRIVER
  M:    Dave Jiang <dave.jiang@intel.com>
@@@ -9546,17 -9514,17 +9545,17 @@@ F:   include/linux/mfd/intel-m10-bmc.
  
  INTEL MENLOW THERMAL DRIVER
  M:    Sujith Thomas <sujith.thomas@intel.com>
 -L:    platform-driver-x86@vger.kernel.org
 +L:    linux-pm@vger.kernel.org
  S:    Supported
  W:    https://01.org/linux-acpi
 -F:    drivers/platform/x86/intel_menlow.c
 +F:    drivers/thermal/intel/intel_menlow.c
  
  INTEL P-Unit IPC DRIVER
  M:    Zha Qipeng <qipeng.zha@intel.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    arch/x86/include/asm/intel_punit_ipc.h
 -F:    drivers/platform/x86/intel_punit_ipc.c
 +F:    drivers/platform/x86/intel/punit_ipc.c
  
  INTEL PMC CORE DRIVER
  M:    Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>
@@@ -9564,7 -9532,7 +9563,7 @@@ M:      David E Box <david.e.box@intel.com
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-platform-intel-pmc
 -F:    drivers/platform/x86/intel_pmc_core*
 +F:    drivers/platform/x86/intel/pmc/
  
  INTEL PMIC GPIO DRIVERS
  M:    Andy Shevchenko <andy@kernel.org>
@@@ -9582,7 -9550,7 +9581,7 @@@ INTEL PMT DRIVE
  M:    "David E. Box" <david.e.box@linux.intel.com>
  S:    Maintained
  F:    drivers/mfd/intel_pmt.c
 -F:    drivers/platform/x86/intel_pmt_*
 +F:    drivers/platform/x86/intel/pmt/
  
  INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
  M:    Stanislav Yakovlev <stas.yakovlev@gmail.com>
@@@ -9619,7 -9587,7 +9618,7 @@@ INTEL SPEED SELECT TECHNOLOG
  M:    Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/intel_speed_select_if/
 +F:    drivers/platform/x86/intel/speed_select_if/
  F:    include/uapi/linux/isst_if.h
  F:    tools/power/x86/intel-speed-select/
  
@@@ -9640,19 -9608,19 +9639,19 @@@ M:   "David E. Box" <david.e.box@linux.in
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    arch/x86/include/asm/intel_telemetry.h
 -F:    drivers/platform/x86/intel_telemetry*
 +F:    drivers/platform/x86/intel/telemetry/
  
  INTEL UNCORE FREQUENCY CONTROL
  M:    Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/intel-uncore-frequency.c
 +F:    drivers/platform/x86/intel/uncore-frequency.c
  
  INTEL VIRTUAL BUTTON DRIVER
  M:    AceLan Kao <acelan.kao@canonical.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/intel-vbtn.c
 +F:    drivers/platform/x86/intel/vbtn.c
  
  INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
  M:    Stanislaw Gruszka <stf_xl@wp.pl>
@@@ -9673,12 -9641,12 +9672,12 @@@ M:   Jithu Joseph <jithu.joseph@intel.com
  R:    Maurice Ma <maurice.ma@intel.com>
  S:    Maintained
  W:    https://slimbootloader.github.io/security/firmware-update.html
 -F:    drivers/platform/x86/intel-wmi-sbl-fw-update.c
 +F:    drivers/platform/x86/intel/wmi/sbl-fw-update.c
  
  INTEL WMI THUNDERBOLT FORCE POWER DRIVER
  L:    Dell.Client.Kernel@dell.com
  S:    Maintained
 -F:    drivers/platform/x86/intel-wmi-thunderbolt.c
 +F:    drivers/platform/x86/intel/wmi/thunderbolt.c
  
  INTEL WWAN IOSM DRIVER
  M:    M Chetan Kumar <m.chetan.kumar@intel.com>
@@@ -10134,7 -10102,6 +10133,7 @@@ F:   fs/autofs
  KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
  M:    Masahiro Yamada <masahiroy@kernel.org>
  M:    Michal Marek <michal.lkml@markovi.net>
 +R:    Nick Desaulniers <ndesaulniers@google.com>
  L:    linux-kbuild@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git
@@@ -10622,10 -10589,10 +10621,10 @@@ T:        git git://git.kernel.org/pub/scm/lin
  F:    drivers/ata/sata_promise.*
  
  LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
 -M:    Jens Axboe <axboe@kernel.dk>
 +M:    Damien Le Moal <damien.lemoal@opensource.wdc.com>
  L:    linux-ide@vger.kernel.org
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git
  F:    Documentation/devicetree/bindings/ata/
  F:    drivers/ata/
  F:    include/linux/ata.h
@@@ -11138,7 -11105,7 +11137,7 @@@ MARDUK (CREATOR CI40) DEVICE TREE SUPPO
  M:    Rahul Bedarkar <rahulbedarkar89@gmail.com>
  L:    linux-mips@vger.kernel.org
  S:    Maintained
 -F:    arch/mips/boot/dts/img/pistachio_marduk.dts
 +F:    arch/mips/boot/dts/img/pistachio*
  
  MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
  M:    Andrew Lunn <andrew@lunn.ch>
@@@ -11190,7 -11157,7 +11189,7 @@@ F:   drivers/net/wireless/marvell/liberta
  
  MARVELL MACCHIATOBIN SUPPORT
  M:    Russell King <linux@armlinux.org.uk>
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
  
@@@ -12638,7 -12605,6 +12637,7 @@@ Q:   http://patchwork.linuxtv.org/project
  F:    drivers/media/dvb-frontends/mn88473*
  
  MODULE SUPPORT
 +M:    Luis Chamberlain <mcgrof@kernel.org>
  M:    Jessica Yu <jeyu@kernel.org>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
@@@ -13358,15 -13324,6 +13357,15 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    Documentation/filesystems/ntfs.rst
  F:    fs/ntfs/
  
 +NTFS3 FILESYSTEM
 +M:    Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
 +L:    ntfs3@lists.linux.dev
 +S:    Supported
 +W:    http://www.paragon-software.com/
 +T:    git https://github.com/Paragon-Software-Group/linux-ntfs3.git
 +F:    Documentation/filesystems/ntfs3.rst
 +F:    fs/ntfs3/
 +
  NUBUS SUBSYSTEM
  M:    Finn Thain <fthain@linux-m68k.org>
  L:    linux-m68k@lists.linux-m68k.org
@@@ -13409,7 -13366,7 +13408,7 @@@ F:   include/linux/nvme-fc.
  NVM EXPRESS TARGET DRIVER
  M:    Christoph Hellwig <hch@lst.de>
  M:    Sagi Grimberg <sagi@grimberg.me>
- M:    Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
+ M:    Chaitanya Kulkarni <kch@nvidia.com>
  L:    linux-nvme@lists.infradead.org
  S:    Supported
  W:    http://git.infradead.org/nvme.git
@@@ -14271,7 -14228,7 +14270,7 @@@ F:   drivers/pci/controller/pcie-altera.
  PCI DRIVER FOR APPLIEDMICRO XGENE
  M:    Toan Le <toan@os.amperecomputing.com>
  L:    linux-pci@vger.kernel.org
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/xgene-pci.txt
  F:    drivers/pci/controller/pci-xgene.c
  PCI DRIVER FOR ARM VERSATILE PLATFORM
  M:    Rob Herring <robh@kernel.org>
  L:    linux-pci@vger.kernel.org
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/versatile.yaml
  F:    drivers/pci/controller/pci-versatile.c
  PCI DRIVER FOR ARMADA 8K
  M:    Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  L:    linux-pci@vger.kernel.org
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/pci-armada8k.txt
  F:    drivers/pci/controller/dwc/pcie-armada8k.c
@@@ -14305,7 -14262,7 +14304,7 @@@ M:   Mingkai Hu <mingkai.hu@nxp.com
  M:    Roy Zang <roy.zang@nxp.com>
  L:    linuxppc-dev@lists.ozlabs.org
  L:    linux-pci@vger.kernel.org
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/pci/controller/dwc/*layerscape*
  
@@@ -14385,7 -14342,7 +14384,7 @@@ F:   drivers/pci/controller/pci-tegra.
  PCI DRIVER FOR NXP LAYERSCAPE GEN4 CONTROLLER
  M:    Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
  L:    linux-pci@vger.kernel.org
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt
  F:    drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c
@@@ -14420,7 -14377,7 +14419,7 @@@ PCI DRIVER FOR TI DRA7XX/J721
  M:    Kishon Vijay Abraham I <kishon@ti.com>
  L:    linux-omap@vger.kernel.org
  L:    linux-pci@vger.kernel.org
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/pci/ti-pci.txt
  F:    drivers/pci/controller/cadence/pci-j721e.c
@@@ -14476,7 -14433,7 +14475,7 @@@ F:   drivers/pci/controller/pcie-altera-m
  PCI MSI DRIVER FOR APPLIEDMICRO XGENE
  M:    Toan Le <toan@os.amperecomputing.com>
  L:    linux-pci@vger.kernel.org
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/xgene-pci-msi.txt
  F:    drivers/pci/controller/pci-xgene-msi.c
@@@ -14560,13 -14517,6 +14559,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt
  F:    drivers/pci/controller/dwc/pcie-histb.c
  
 +PCIE DRIVER FOR INTEL KEEM BAY
 +M:    Srikanth Thokala <srikanth.thokala@intel.com>
 +L:    linux-pci@vger.kernel.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/intel,keembay-pcie*
 +F:    drivers/pci/controller/dwc/pcie-keembay.c
 +
  PCIE DRIVER FOR INTEL LGM GW SOC
  M:    Rahul Tanwar <rtanwar@maxlinear.com>
  L:    linux-pci@vger.kernel.org
@@@ -14769,12 -14719,6 +14768,12 @@@ F: Documentation/driver-api/pin-control
  F:    drivers/pinctrl/
  F:    include/linux/pinctrl/
  
 +PIN CONTROLLER - AMD
 +M:    Basavaraj Natikar <Basavaraj.Natikar@amd.com>
 +M:    Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 +S:    Maintained
 +F:    drivers/pinctrl/pinctrl-amd.c
 +
  PIN CONTROLLER - FREESCALE
  M:    Dong Aisheng <aisheng.dong@nxp.com>
  M:    Fabio Estevam <festevam@gmail.com>
@@@ -14793,19 -14737,12 +14792,19 @@@ S:        Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
  F:    drivers/pinctrl/intel/
  
 +PIN CONTROLLER - KEEMBAY
 +M:    Lakshmi Sowjanya D <lakshmi.sowjanya.d@intel.com>
 +S:    Supported
 +F:    drivers/pinctrl/pinctrl-keembay*
 +
  PIN CONTROLLER - MEDIATEK
  M:    Sean Wang <sean.wang@kernel.org>
  L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt
 -F:    Documentation/devicetree/bindings/pinctrl/pinctrl-mt7622.txt
 +F:    Documentation/devicetree/bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/mediatek,mt6797-pinctrl.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/mediatek,mt8183-pinctrl.yaml
  F:    drivers/pinctrl/mediatek/
  
  PIN CONTROLLER - MICROCHIP AT91
@@@ -14859,6 -14796,14 +14858,6 @@@ S:  Maintaine
  W:    http://www.st.com/spear
  F:    drivers/pinctrl/spear/
  
 -PISTACHIO SOC SUPPORT
 -M:    James Hartley <james.hartley@sondrel.com>
 -L:    linux-mips@vger.kernel.org
 -S:    Odd Fixes
 -F:    arch/mips/boot/dts/img/pistachio*
 -F:    arch/mips/configs/pistachio*_defconfig
 -F:    arch/mips/pistachio/
 -
  PKTCDVD DRIVER
  M:    linux-block@vger.kernel.org
  S:    Orphan
@@@ -14968,7 -14913,7 +14967,7 @@@ F:   kernel/time/*timer
  F:    kernel/time/namespace.c
  
  POWER MANAGEMENT CORE
 -M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
 +M:    "Rafael J. Wysocki" <rafael@kernel.org>
  L:    linux-pm@vger.kernel.org
  S:    Supported
  B:    https://bugzilla.kernel.org
@@@ -14993,7 -14938,7 +14992,7 @@@ F:   include/linux/dtpm.
  POWER STATE COORDINATION INTERFACE (PSCI)
  M:    Mark Rutland <mark.rutland@arm.com>
  M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/firmware/psci/
  F:    include/linux/psci.h
@@@ -15518,7 -15463,7 +15517,7 @@@ F:   arch/hexagon
  
  QUALCOMM HIDMA DRIVER
  M:    Sinan Kaya <okaya@kernel.org>
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-arm-msm@vger.kernel.org
  L:    dmaengine@vger.kernel.org
  S:    Supported
@@@ -16566,14 -16511,10 +16565,14 @@@ L:        linux-samsung-soc@vger.kernel.or
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
  F:    Documentation/devicetree/bindings/clock/exynos*.txt
 +F:    Documentation/devicetree/bindings/clock/samsung,*.yaml
  F:    Documentation/devicetree/bindings/clock/samsung,s3c*
  F:    Documentation/devicetree/bindings/clock/samsung,s5p*
  F:    drivers/clk/samsung/
  F:    include/dt-bindings/clock/exynos*.h
 +F:    include/dt-bindings/clock/s3c*.h
 +F:    include/dt-bindings/clock/s5p*.h
 +F:    include/dt-bindings/clock/samsung,*.h
  F:    include/linux/clk/samsung.h
  F:    include/linux/platform_data/clk-s3c2410.h
  
@@@ -17232,7 -17173,7 +17231,7 @@@ SECURE MONITOR CALL(SMC) CALLING CONVEN
  M:    Mark Rutland <mark.rutland@arm.com>
  M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  M:    Sudeep Holla <sudeep.holla@arm.com>
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/firmware/smccc/
  F:    include/linux/arm-smccc.h
@@@ -17349,7 -17290,7 +17348,7 @@@ F:   drivers/media/pci/solo6x10
  
  SOFTWARE DELEGATED EXCEPTION INTERFACE (SDEI)
  M:    James Morse <james.morse@arm.com>
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/firmware/sdei.txt
  F:    drivers/firmware/arm_sdei.c
@@@ -17946,7 -17887,7 +17945,7 @@@ F:   arch/sh
  F:    drivers/sh/
  
  SUSPEND TO RAM
 -M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
 +M:    "Rafael J. Wysocki" <rafael@kernel.org>
  M:    Len Brown <len.brown@intel.com>
  M:    Pavel Machek <pavel@ucw.cz>
  L:    linux-pm@vger.kernel.org
@@@ -18136,7 -18077,7 +18135,7 @@@ F:   drivers/mfd/syscon.
  SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE (SCPI/SCMI) Message Protocol drivers
  M:    Sudeep Holla <sudeep.holla@arm.com>
  R:    Cristian Marussi <cristian.marussi@arm.com>
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/firmware/arm,sc[mp]i.yaml
  F:    drivers/clk/clk-sc[mp]i.c
@@@ -18509,7 -18450,7 +18508,7 @@@ TEXAS INSTRUMENTS' SYSTEM CONTROL INTER
  M:    Nishanth Menon <nm@ti.com>
  M:    Tero Kristo <kristo@kernel.org>
  M:    Santosh Shilimkar <ssantosh@kernel.org>
 -L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml
  F:    Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
@@@ -18566,7 -18507,6 +18565,7 @@@ F:   drivers/thermal
  F:    include/linux/cpu_cooling.h
  F:    include/linux/thermal.h
  F:    include/uapi/linux/thermal.h
 +F:    tools/thermal/
  
  THERMAL DRIVER FOR AMLOGIC SOCS
  M:    Guillaume La Roque <glaroque@baylibre.com>
@@@ -18999,20 -18939,6 +18998,20 @@@ F: arch/x86/mm/testmmiotrace.
  F:    include/linux/mmiotrace.h
  F:    kernel/trace/trace_mmiotrace.c
  
 +TRACING OS NOISE / LATENCY TRACERS
 +M:    Steven Rostedt <rostedt@goodmis.org>
 +M:    Daniel Bristot de Oliveira <bristot@kernel.org>
 +S:    Maintained
 +F:    kernel/trace/trace_osnoise.c
 +F:    include/trace/events/osnoise.h
 +F:    kernel/trace/trace_hwlat.c
 +F:    kernel/trace/trace_irqsoff.c
 +F:    kernel/trace/trace_sched_wakeup.c
 +F:    Documentation/trace/osnoise-tracer.rst
 +F:    Documentation/trace/timerlat-tracer.rst
 +F:    Documentation/trace/hwlat_detector.rst
 +F:    arch/*/kernel/trace.c
 +
  TRADITIONAL CHINESE DOCUMENTATION
  M:    Hu Haowen <src.res@email.cn>
  L:    linux-doc-tw-discuss@lists.sourceforge.net
@@@ -19193,8 -19119,9 +19192,8 @@@ W:   http://dotat.at/prog/unifde
  F:    scripts/unifdef.c
  
  UNIFORM CDROM DRIVER
 -M:    Jens Axboe <axboe@kernel.dk>
 +M:    Phillip Potter <phil@philpotter.co.uk>
  S:    Maintained
 -W:    http://www.kernel.dk
  F:    Documentation/cdrom/
  F:    drivers/cdrom/cdrom.c
  F:    include/linux/cdrom.h
@@@ -19679,7 -19606,6 +19678,7 @@@ T:   git git://github.com/awilliam/linux-
  F:    Documentation/driver-api/vfio.rst
  F:    drivers/vfio/
  F:    include/linux/vfio.h
 +F:    include/linux/vfio_pci_core.h
  F:    include/uapi/linux/vfio.h
  
  VFIO FSL-MC DRIVER
@@@ -19788,11 -19714,18 +19787,11 @@@ L:        kvm@vger.kernel.or
  L:    virtualization@lists.linux-foundation.org
  L:    netdev@vger.kernel.org
  S:    Maintained
 -F:    drivers/net/vsockmon.c
  F:    drivers/vhost/vsock.c
  F:    include/linux/virtio_vsock.h
  F:    include/uapi/linux/virtio_vsock.h
 -F:    include/uapi/linux/vm_sockets_diag.h
 -F:    include/uapi/linux/vsockmon.h
 -F:    net/vmw_vsock/af_vsock_tap.c
 -F:    net/vmw_vsock/diag.c
  F:    net/vmw_vsock/virtio_transport.c
  F:    net/vmw_vsock/virtio_transport_common.c
 -F:    net/vmw_vsock/vsock_loopback.c
 -F:    tools/testing/vsock/
  
  VIRTIO BLOCK AND SCSI DRIVERS
  M:    "Michael S. Tsirkin" <mst@redhat.com>
@@@ -19871,15 -19804,6 +19870,15 @@@ F: Documentation/filesystems/virtiofs.r
  F:    fs/fuse/virtio_fs.c
  F:    include/uapi/linux/virtio_fs.h
  
 +VIRTIO GPIO DRIVER
 +M:    Enrico Weigelt, metux IT consult <info@metux.net>
 +M:    Viresh Kumar <vireshk@kernel.org>
 +L:    linux-gpio@vger.kernel.org
 +L:    virtualization@lists.linux-foundation.org
 +S:    Maintained
 +F:    drivers/gpio/gpio-virtio.c
 +F:    include/uapi/linux/virtio_gpio.h
 +
  VIRTIO GPU DRIVER
  M:    David Airlie <airlied@linux.ie>
  M:    Gerd Hoffmann <kraxel@redhat.com>
@@@ -19997,19 -19921,6 +19996,19 @@@ F: drivers/staging/vme
  F:    drivers/vme/
  F:    include/linux/vme*
  
 +VM SOCKETS (AF_VSOCK)
 +M:    Stefano Garzarella <sgarzare@redhat.com>
 +L:    virtualization@lists.linux-foundation.org
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/vsockmon.c
 +F:    include/net/af_vsock.h
 +F:    include/uapi/linux/vm_sockets.h
 +F:    include/uapi/linux/vm_sockets_diag.h
 +F:    include/uapi/linux/vsockmon.h
 +F:    net/vmw_vsock/
 +F:    tools/testing/vsock/
 +
  VMWARE BALLOON DRIVER
  M:    Nadav Amit <namit@vmware.com>
  M:    "VMware, Inc." <pv-drivers@vmware.com>
@@@ -20587,7 -20498,7 +20586,7 @@@ R:   Srinivas Neeli <srinivas.neeli@xilin
  R:    Michal Simek <michal.simek@xilinx.com>
  S:    Maintained
  F:    Documentation/devicetree/bindings/gpio/gpio-xilinx.txt
 -F:    Documentation/devicetree/bindings/gpio/gpio-zynq.txt
 +F:    Documentation/devicetree/bindings/gpio/gpio-zynq.yaml
  F:    drivers/gpio/gpio-xilinx.c
  F:    drivers/gpio/gpio-zynq.c
  
diff --combined block/Makefile
@@@ -3,7 -3,7 +3,7 @@@
  # Makefile for the kernel block layer
  #
  
- obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-sysfs.o \
+ obj-$(CONFIG_BLOCK) := bdev.o fops.o bio.o elevator.o blk-core.o blk-sysfs.o \
                        blk-flush.o blk-settings.o blk-ioc.o blk-map.o \
                        blk-exec.o blk-merge.o blk-timeout.o \
                        blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \
@@@ -12,7 -12,8 +12,7 @@@
                        disk-events.o
  
  obj-$(CONFIG_BOUNCE)          += bounce.o
 -obj-$(CONFIG_BLK_SCSI_REQUEST)        += scsi_ioctl.o
 -obj-$(CONFIG_BLK_DEV_BSG)     += bsg.o
 +obj-$(CONFIG_BLK_DEV_BSG_COMMON) += bsg.o
  obj-$(CONFIG_BLK_DEV_BSGLIB)  += bsg-lib.o
  obj-$(CONFIG_BLK_CGROUP)      += blk-cgroup.o
  obj-$(CONFIG_BLK_CGROUP_RWSTAT)       += blk-cgroup-rwstat.o
diff --combined block/blk-mq.c
@@@ -2135,6 -2135,18 +2135,18 @@@ static void blk_add_rq_to_plug(struct b
        }
  }
  
+ /*
+  * Allow 4x BLK_MAX_REQUEST_COUNT requests on plug queue for multiple
+  * queues. This is important for md arrays to benefit from merging
+  * requests.
+  */
+ static inline unsigned short blk_plug_max_rq_count(struct blk_plug *plug)
+ {
+       if (plug->multiple_queues)
+               return BLK_MAX_REQUEST_COUNT * 4;
+       return BLK_MAX_REQUEST_COUNT;
+ }
  /**
   * blk_mq_submit_bio - Create and send a request to block device.
   * @bio: Bio pointer.
@@@ -2231,7 -2243,7 +2243,7 @@@ blk_qc_t blk_mq_submit_bio(struct bio *
                else
                        last = list_entry_rq(plug->mq_list.prev);
  
-               if (request_count >= BLK_MAX_REQUEST_COUNT || (last &&
+               if (request_count >= blk_plug_max_rq_count(plug) || (last &&
                    blk_rq_bytes(last) >= BLK_PLUG_FLUSH_SIZE)) {
                        blk_flush_plug_list(plug, false);
                        trace_block_plug(q);
@@@ -3280,6 -3292,8 +3292,6 @@@ int blk_mq_init_allocated_queue(struct 
            set->map[HCTX_TYPE_POLL].nr_queues)
                blk_queue_flag_set(QUEUE_FLAG_POLL, q);
  
 -      q->sg_reserved_size = INT_MAX;
 -
        INIT_DELAYED_WORK(&q->requeue_work, blk_mq_requeue_work);
        INIT_LIST_HEAD(&q->requeue_list);
        spin_lock_init(&q->requeue_lock);
diff --combined fs/Makefile
@@@ -17,7 -17,7 +17,7 @@@ obj-y :=      open.o read_write.o file_table
                kernel_read_file.o remap_range.o
  
  ifeq ($(CONFIG_BLOCK),y)
- obj-y +=      buffer.o block_dev.o direct-io.o mpage.o
+ obj-y +=      buffer.o direct-io.o mpage.o
  else
  obj-y +=      no-block.o
  endif
@@@ -101,7 -101,6 +101,7 @@@ obj-$(CONFIG_CIFS)         += cifs
  obj-$(CONFIG_SMB_SERVER)      += ksmbd/
  obj-$(CONFIG_HPFS_FS)         += hpfs/
  obj-$(CONFIG_NTFS_FS)         += ntfs/
 +obj-$(CONFIG_NTFS3_FS)                += ntfs3/
  obj-$(CONFIG_UFS_FS)          += ufs/
  obj-$(CONFIG_EFS_FS)          += efs/
  obj-$(CONFIG_JFFS2_FS)                += jffs2/