Merge tag 'cxl-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Feb 2021 17:38:36 +0000 (09:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Feb 2021 17:38:36 +0000 (09:38 -0800)
Pull initial support for CXL (Compute Express Link) from Dan Williams:
 "Introduce an initial driver for CXL 2.0 Type-3 Memory Devices.

  CXL is Compute Express Link which released the 2.0 specification in
  November. The Linux relevant changes in CXL 2.0 are support for an OS
  to dynamically assign address space to memory devices, support for
  switches, persistent memory, and hotplug.

  A Type-3 Memory Device is a PCI enumerated device presenting the CXL
  Memory Device Class Code and implementing the CXL.mem protocol.
  CXL.mem allows device to advertise CPU and I/O coherent memory to the
  system, i.e. typical "System RAM" and "Persistent Memory" in Linux
  /proc/iomem terms.

  In addition to the CXL.mem fast path there is an administrative
  command hardware mailbox interface for maintenance and provisioning.
  It is this command interface that is the focus of the initial driver.
  With this driver a CXL device that is mapped by the BIOS can be
  administered by Linux.

  Linux support for CXL PMEM and dynamic CXL address space management
  are to be implemented post v5.12"

Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  4cdadfd5e0a7 ("cxl/mem: Introduce a driver for CXL-2.0-Type-3 endpoints")
  13237183c735 ("cxl/mem: Add a "RAW" send command")
  472b1ce6e9d6 ("cxl/mem: Enable commands via CEL")
  57ee605b976c ("cxl/mem: Add set of informational commands")

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
  8adaf747c9f0 ("cxl/mem: Find device capabilities")
  b39cb1052a5c ("cxl/mem: Register CXL memX devices")

* tag 'cxl-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  cxl/mem: Fix potential memory leak
  cxl/mem: Return -EFAULT if copy_to_user() fails
  MAINTAINERS: Add maintainers of the CXL driver
  cxl/mem: Add set of informational commands
  cxl/mem: Enable commands via CEL
  cxl/mem: Add a "RAW" send command
  cxl/mem: Add basic IOCTL interface
  cxl/mem: Register CXL memX devices
  cxl/mem: Find device capabilities
  cxl/mem: Introduce a driver for CXL-2.0-Type-3 endpoints

1  2 
.clang-format
Documentation/driver-api/index.rst
Documentation/userspace-api/ioctl/ioctl-number.rst
MAINTAINERS

diff --combined .clang-format
@@@ -109,6 -109,7 +109,7 @@@ ForEachMacros
    - 'css_for_each_child'
    - 'css_for_each_descendant_post'
    - 'css_for_each_descendant_pre'
+   - 'cxl_for_each_cmd'
    - 'device_for_each_child_node'
    - 'dma_fence_chain_for_each'
    - 'do_for_each_ftrace_op'
    - 'drm_for_each_bridge_in_chain'
    - 'drm_for_each_connector_iter'
    - 'drm_for_each_crtc'
 +  - 'drm_for_each_crtc_reverse'
    - 'drm_for_each_encoder'
    - 'drm_for_each_encoder_mask'
    - 'drm_for_each_fb'
    - 'for_each_matching_node'
    - 'for_each_matching_node_and_match'
    - 'for_each_member'
 -  - 'for_each_mem_region'
 -  - 'for_each_memblock_type'
    - 'for_each_memcg_cache_index'
    - 'for_each_mem_pfn_range'
    - '__for_each_mem_range'
    - 'for_each_mem_range'
    - '__for_each_mem_range_rev'
    - 'for_each_mem_range_rev'
 +  - 'for_each_mem_region'
    - 'for_each_migratetype_order'
    - 'for_each_msi_entry'
    - 'for_each_msi_entry_safe'
    - 'for_each_reserved_mem_range'
    - 'for_each_reserved_mem_region'
    - 'for_each_rtd_codec_dais'
 -  - 'for_each_rtd_codec_dais_rollback'
    - 'for_each_rtd_components'
    - 'for_each_rtd_cpu_dais'
 -  - 'for_each_rtd_cpu_dais_rollback'
    - 'for_each_rtd_dais'
    - 'for_each_set_bit'
    - 'for_each_set_bit_from'
    - '__for_each_thread'
    - 'for_each_thread'
    - 'for_each_unicast_dest_pgid'
 +  - 'for_each_vsi'
    - 'for_each_wakeup_source'
    - 'for_each_zone'
    - 'for_each_zone_zonelist'
    - 'hlist_for_each_entry_rcu_bh'
    - 'hlist_for_each_entry_rcu_notrace'
    - 'hlist_for_each_entry_safe'
 +  - 'hlist_for_each_entry_srcu'
    - '__hlist_for_each_rcu'
    - 'hlist_for_each_safe'
    - 'hlist_nulls_for_each_entry'
    - 'list_for_each_entry_safe_continue'
    - 'list_for_each_entry_safe_from'
    - 'list_for_each_entry_safe_reverse'
 +  - 'list_for_each_entry_srcu'
    - 'list_for_each_prev'
    - 'list_for_each_prev_safe'
    - 'list_for_each_safe'
    - 'of_property_for_each_string'
    - 'of_property_for_each_u32'
    - 'pci_bus_for_each_resource'
 +  - 'pcl_for_each_chunk'
 +  - 'pcl_for_each_segment'
    - 'pcm_for_each_format'
    - 'ping_portaddr_for_each_entry'
    - 'plist_for_each'
@@@ -35,6 -35,7 +35,7 @@@ available subsections can be seen below
     usb/index
     firewire
     pci/index
+    cxl/index
     spi
     i2c
     ipmb
     rfkill
     serial/index
     sm501
 +   surface_aggregator/index
     switchtec
     sync_file
     vfio-mediated-device
@@@ -157,6 -157,7 +157,6 @@@ Code  Seq#    Include Fil
  'I'   all    linux/isdn.h                                            conflict!
  'I'   00-0F  drivers/isdn/divert/isdn_divert.h                       conflict!
  'I'   40-4F  linux/mISDNif.h                                         conflict!
 -'J'   00-1F  drivers/scsi/gdth_ioctl.h
  'K'   all    linux/kd.h
  'L'   00-1F  linux/loop.h                                            conflict!
  'L'   10-1F  drivers/scsi/mpt3sas/mpt3sas_ctl.h                      conflict!
  0xA3  90-9F  linux/dtlk.h
  0xA4  00-1F  uapi/linux/tee.h                                        Generic TEE subsystem
  0xA4  00-1F  uapi/asm/sgx.h                                          <mailto:linux-sgx@vger.kernel.org>
 +0xA5  01     linux/surface_aggregator/cdev.h                         Microsoft Surface Platform System Aggregator
 +                                                                     <mailto:luzmaximilian@gmail.com>
  0xAA  00-3F  linux/uapi/linux/userfaultfd.h
  0xAB  00-1F  linux/nbd.h
  0xAC  00-1F  linux/raw.h
                                                                       <mailto:michael.klein@puffin.lb.shuttle.de>
  0xCC  00-0F  drivers/misc/ibmvmc.h                                   pseries VMC driver
  0xCD  01     linux/reiserfs_fs.h
+ 0xCE  01-02  uapi/linux/cxl_mem.h                                    Compute Express Link Memory Devices
  0xCF  02     fs/cifs/ioctl.c
  0xDB  00-0F  drivers/char/mwave/mwavepub.h
  0xDD  00-3F                                                          ZFCP device driver see drivers/s390/scsi/
diff --combined MAINTAINERS
@@@ -699,8 -699,7 +699,8 @@@ M: Michael Tretter <m.tretter@pengutron
  R:    Pengutronix Kernel Team <kernel@pengutronix.de>
  L:    linux-media@vger.kernel.org
  S:    Maintained
 -F:    drivers/staging/media/allegro-dvt/
 +F:    Documentation/devicetree/bindings/media/allegro,al5e.yaml
 +F:    drivers/media/platform/allegro-dvt/
  
  ALLWINNER A10 CSI DRIVER
  M:    Maxime Ripard <mripard@kernel.org>
@@@ -1414,6 -1413,7 +1414,6 @@@ F:      arch/arm*/include/asm/hw_breakpoint.
  F:    arch/arm*/include/asm/perf_event.h
  F:    arch/arm*/kernel/hw_breakpoint.c
  F:    arch/arm*/kernel/perf_*
 -F:    arch/arm/oprofile/common.c
  F:    drivers/perf/
  F:    include/linux/perf/arm_pmu.h
  
@@@ -1511,7 -1511,6 +1511,7 @@@ ARM/ACTIONS SEMI ARCHITECTUR
  M:    Andreas Färber <afaerber@suse.de>
  M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-actions@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/actions.yaml
  F:    Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
@@@ -1779,6 -1778,19 +1779,6 @@@ F:     drivers/net/ethernet/cortina
  F:    drivers/pinctrl/pinctrl-gemini.c
  F:    drivers/rtc/rtc-ftrtc010.c
  
 -ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
 -M:    Barry Song <baohua@kernel.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/baohua/linux.git
 -F:    arch/arm/boot/dts/prima2*
 -F:    arch/arm/mach-prima2/
 -F:    drivers/clk/sirf/
 -F:    drivers/clocksource/timer-atlas7.c
 -F:    drivers/clocksource/timer-prima2.c
 -X:    drivers/gnss
 -N:    [^a-z]sirf
 -
  ARM/CZ.NIC TURRIS MOX SUPPORT
  M:    Marek Behun <marek.behun@nic.cz>
  S:    Maintained
@@@ -1794,6 -1806,13 +1794,6 @@@ F:     drivers/firmware/turris-mox-rwtm.
  F:    drivers/gpio/gpio-moxtet.c
  F:    include/linux/moxtet.h
  
 -ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT
 -M:    Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 -R:    Pengutronix Kernel Team <kernel@pengutronix.de>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -N:    efm32
 -
  ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
  M:    Robert Jarzmik <robert.jarzmik@free.fr>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2071,7 -2090,7 +2071,7 @@@ M:      Chunfeng Yun <chunfeng.yun@mediatek.
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/phy/phy-mtk-*
 +F:    Documentation/devicetree/bindings/phy/mediatek,*
  F:    drivers/phy/mediatek/
  
  ARM/Microchip (AT91) SoC support
@@@ -2126,20 -2145,17 +2126,20 @@@ L:   linux-arm-kernel@lists.infradead.or
  S:    Maintained
  W:    http://linux-chenxing.org/
  F:    Documentation/devicetree/bindings/arm/mstar/*
 +F:    Documentation/devicetree/bindings/clock/mstar,msc313-mpll.yaml
  F:    Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml
  F:    arch/arm/boot/dts/mstar-*
  F:    arch/arm/mach-mstar/
 +F:    drivers/clk/mstar/
  F:    drivers/gpio/gpio-msc313.c
 +F:    include/dt-bindings/clock/mstar-*
  F:    include/dt-bindings/gpio/msc313-gpio.h
  
  ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
  M:    Michael Petchkovsky <mkpetch@internode.on.net>
  S:    Maintained
  
 -ARM/NOMADIK/U300/Ux500 ARCHITECTURES
 +ARM/NOMADIK/Ux500 ARCHITECTURES
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -2148,23 -2164,35 +2148,23 @@@ F:   Documentation/devicetree/bindings/ar
  F:    Documentation/devicetree/bindings/arm/ux500.yaml
  F:    Documentation/devicetree/bindings/arm/ux500/
  F:    Documentation/devicetree/bindings/i2c/i2c-nomadik.txt
 -F:    Documentation/devicetree/bindings/i2c/i2c-stu300.txt
  F:    arch/arm/boot/dts/ste-*
  F:    arch/arm/mach-nomadik/
 -F:    arch/arm/mach-u300/
  F:    arch/arm/mach-ux500/
  F:    drivers/clk/clk-nomadik.c
 -F:    drivers/clk/clk-u300.c
  F:    drivers/clocksource/clksrc-dbx500-prcmu.c
 -F:    drivers/clocksource/timer-u300.c
 -F:    drivers/dma/coh901318*
  F:    drivers/dma/ste_dma40*
  F:    drivers/hwspinlock/u8500_hsem.c
  F:    drivers/i2c/busses/i2c-nomadik.c
 -F:    drivers/i2c/busses/i2c-stu300.c
  F:    drivers/iio/adc/ab8500-gpadc.c
 -F:    drivers/mfd/ab3100*
  F:    drivers/mfd/ab8500*
  F:    drivers/mfd/abx500*
  F:    drivers/mfd/db8500*
  F:    drivers/mfd/dbx500*
  F:    drivers/pinctrl/nomadik/
 -F:    drivers/pinctrl/pinctrl-coh901*
 -F:    drivers/pinctrl/pinctrl-u300.c
 -F:    drivers/rtc/rtc-ab3100.c
  F:    drivers/rtc/rtc-ab8500.c
 -F:    drivers/rtc/rtc-coh901331.c
  F:    drivers/rtc/rtc-pl031.c
  F:    drivers/soc/ux500/
 -F:    drivers/watchdog/coh901327_wdt.c
  
  ARM/NUVOTON NPCM ARCHITECTURE
  M:    Avi Fishman <avifishman70@gmail.com>
@@@ -2386,8 -2414,6 +2386,8 @@@ F:      drivers/*/*s5pv210
  F:    drivers/memory/samsung/
  F:    drivers/soc/samsung/
  F:    drivers/tty/serial/samsung*
 +F:    include/linux/platform_data/*s3c*
 +F:    include/linux/serial_s3c.h
  F:    include/linux/soc/samsung/
  N:    exynos
  N:    s3c2410
@@@ -2531,6 -2557,13 +2531,6 @@@ F:     arch/arm/boot/dts/berlin
  F:    arch/arm/mach-berlin/
  F:    arch/arm64/boot/dts/synaptics/
  
 -ARM/TANGO ARCHITECTURE
 -M:    Marc Gonzalez <marc.w.gonzalez@free.fr>
 -M:    Mans Rullgard <mans@mansr.com>
 -L:    linux-arm-kernel@lists.infradead.org
 -S:    Odd Fixes
 -N:    tango
 -
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2583,8 -2616,8 +2583,8 @@@ S:      Maintaine
  F:    drivers/power/reset/keystone-reset.c
  
  ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE
 -M:    Tero Kristo <t-kristo@ti.com>
  M:    Nishanth Menon <nm@ti.com>
 +M:    Tero Kristo <kristo@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/arm/ti/k3.yaml
@@@ -2608,15 -2641,9 +2608,15 @@@ L:    linux-arm-kernel@lists.infradead.or
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti.git
  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/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/pinctrl/visconti/
 +F:    drivers/watchdog/visconti_wdt.c
  N:    visconti
  
  ARM/UNIPHIER ARCHITECTURE
@@@ -2696,6 -2723,40 +2696,6 @@@ S:     Maintaine
  F:    arch/arm/mach-pxa/include/mach/z2.h
  F:    arch/arm/mach-pxa/z2.c
  
 -ARM/ZTE ARCHITECTURE
 -M:    Jun Nie <jun.nie@linaro.org>
 -M:    Shawn Guo <shawnguo@kernel.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/arm/zte.yaml
 -F:    Documentation/devicetree/bindings/clock/zx2967*.txt
 -F:    Documentation/devicetree/bindings/dma/zxdma.txt
 -F:    Documentation/devicetree/bindings/gpio/zx296702-gpio.txt
 -F:    Documentation/devicetree/bindings/i2c/i2c-zx2967.txt
 -F:    Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt
 -F:    Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt
 -F:    Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
 -F:    Documentation/devicetree/bindings/soc/zte/
 -F:    Documentation/devicetree/bindings/sound/zte,*.txt
 -F:    Documentation/devicetree/bindings/thermal/zx2967-thermal.txt
 -F:    Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
 -F:    arch/arm/boot/dts/zx2967*
 -F:    arch/arm/mach-zx/
 -F:    arch/arm64/boot/dts/zte/
 -F:    drivers/clk/zte/
 -F:    drivers/dma/zx_dma.c
 -F:    drivers/gpio/gpio-zx.c
 -F:    drivers/i2c/busses/i2c-zx2967.c
 -F:    drivers/mmc/host/dw_mmc-zx.*
 -F:    drivers/pinctrl/zte/
 -F:    drivers/soc/zte/
 -F:    drivers/thermal/zx2967_thermal.c
 -F:    drivers/watchdog/zx2967_wdt.c
 -F:    include/dt-bindings/clock/zx2967*.h
 -F:    include/dt-bindings/soc/zte,*.h
 -F:    sound/soc/codecs/zx_aud96p22.c
 -F:    sound/soc/zte/
 -
  ARM/ZYNQ ARCHITECTURE
  M:    Michal Simek <michal.simek@xilinx.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2704,7 -2765,6 +2704,7 @@@ W:      http://wiki.xilinx.co
  T:    git https://github.com/Xilinx/linux-xlnx.git
  F:    Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml
  F:    Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml
 +F:    Documentation/devicetree/bindings/spi/xlnx,zynq-qspi.yaml
  F:    arch/arm/mach-zynq/
  F:    drivers/block/xsysace.c
  F:    drivers/clocksource/timer-cadence-ttc.c
@@@ -2727,14 -2787,6 +2727,14 @@@ F:    arch/arm64
  F:    tools/testing/selftests/arm64/
  X:    arch/arm64/boot/dts/
  
 +ARROW SPEEDCHIPS XRS7000 SERIES ETHERNET SWITCH DRIVER
 +M:    George McCollister <george.mccollister@gmail.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/dsa/arrow,xrs700x.yaml
 +F:    drivers/net/dsa/xrs700x/*
 +F:    net/dsa/tag_xrs700x.c
 +
  AS3645A LED FLASH CONTROLLER DRIVER
  M:    Sakari Ailus <sakari.ailus@iki.fi>
  L:    linux-leds@vger.kernel.org
@@@ -2780,15 -2832,6 +2780,15 @@@ F:    Documentation/devicetree/bindings/in
  F:    drivers/irqchip/irq-aspeed-scu-ic.c
  F:    include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
  
 +ASPEED SD/MMC DRIVER
 +M:    Andrew Jeffery <andrew@aj.id.au>
 +L:    linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
 +L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
 +L:    linux-mmc@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mmc/aspeed,sdhci.yaml
 +F:    drivers/mmc/host/sdhci-of-aspeed*
 +
  ASPEED VIDEO ENGINE DRIVER
  M:    Eddie James <eajames@linux.ibm.com>
  L:    linux-media@vger.kernel.org
@@@ -2828,7 -2871,9 +2828,7 @@@ S:      Odd fixe
  W:    http://sourceforge.net/projects/xscaleiop
  F:    Documentation/crypto/async-tx-api.rst
  F:    crypto/async_tx/
 -F:    drivers/dma/
  F:    include/linux/async_tx.h
 -F:    include/linux/dmaengine.h
  
  AT24 EEPROM DRIVER
  M:    Bartosz Golaszewski <bgolaszewski@baylibre.com>
@@@ -3354,7 -3399,6 +3354,7 @@@ L:      openwrt-devel@lists.openwrt.org (sub
  S:    Supported
  F:    Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml
  F:    drivers/net/dsa/b53/*
 +F:    include/linux/dsa/brcm.h
  F:    include/linux/platform_data/b53.h
  
  BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
@@@ -3392,15 -3436,6 +3392,15 @@@ F:    Documentation/devicetree/bindings/mi
  F:    arch/mips/bcm47xx/*
  F:    arch/mips/include/asm/mach-bcm47xx/*
  
 +BROADCOM BCM4908 ETHERNET DRIVER
 +M:    Rafał Miłecki <rafal@milecki.pl>
 +M:    bcm-kernel-feedback-list@broadcom.com
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
 +F:    drivers/net/ethernet/broadcom/bcm4908_enet.*
 +F:    drivers/net/ethernet/broadcom/unimac.h
 +
  BROADCOM BCM5301X ARM ARCHITECTURE
  M:    Hauke Mehrtens <hauke@hauke-m.de>
  M:    Rafał Miłecki <zajec5@gmail.com>
@@@ -3589,7 -3624,6 +3589,7 @@@ S:      Supporte
  F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
  F:    Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
  F:    drivers/net/ethernet/broadcom/genet/
 +F:    drivers/net/ethernet/broadcom/unimac.h
  F:    drivers/net/mdio/mdio-bcm-unimac.c
  F:    include/linux/platform_data/bcmgenet.h
  F:    include/linux/platform_data/mdio-bcm-unimac.h
@@@ -3623,15 -3657,6 +3623,15 @@@ N:    bcm8831
  N:    hr2
  N:    stingray
  
 +BROADCOM IPROC GBIT ETHERNET DRIVER
 +M:    Rafał Miłecki <rafal@milecki.pl>
 +M:    bcm-kernel-feedback-list@broadcom.com
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/brcm,amac.txt
 +F:    drivers/net/ethernet/broadcom/bgmac*
 +F:    drivers/net/ethernet/broadcom/unimac.h
 +
  BROADCOM KONA GPIO DRIVER
  M:    Ray Jui <rjui@broadcom.com>
  L:    bcm-kernel-feedback-list@broadcom.com
@@@ -3657,16 -3682,6 +3657,16 @@@ L:    linux-mips@vger.kernel.or
  S:    Maintained
  F:    drivers/firmware/broadcom/*
  
 +BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER
 +M:    Rafał Miłecki <rafal@milecki.pl>
 +M:    Florian Fainelli <f.fainelli@gmail.com>
 +M:    bcm-kernel-feedback-list@broadcom.com
 +L:    linux-pm@vger.kernel.org
 +S:    Maintained
 +T:    git git://github.com/broadcom/stblinux.git
 +F:    drivers/soc/bcm/bcm-pmb.c
 +F:    include/dt-bindings/soc/bcm-pmb.h
 +
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    Rafał Miłecki <zajec5@gmail.com>
  L:    linux-wireless@vger.kernel.org
@@@ -3721,7 -3736,6 +3721,7 @@@ L:      bcm-kernel-feedback-list@broadcom.co
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
 +F:    drivers/net/ethernet/broadcom/unimac.h
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
  M:    Siva Reddy Kallam <siva.kallam@broadcom.com>
@@@ -3829,6 -3843,14 +3829,6 @@@ F:     drivers/irqchip/irq-csky-
  N:    csky
  K:    csky
  
 -C6X ARCHITECTURE
 -M:    Mark Salter <msalter@redhat.com>
 -M:    Aurelien Jacquiot <jacquiot.aurelien@gmail.com>
 -L:    linux-c6x-dev@linux-c6x.org
 -S:    Maintained
 -W:    http://www.linux-c6x.org/wiki/index.php/Main_Page
 -F:    arch/c6x/
 -
  CA8210 IEEE-802.15.4 RADIO DRIVER
  M:    Harry Morris <h.morris@cascoda.com>
  L:    linux-wpan@vger.kernel.org
@@@ -3867,15 -3889,6 +3867,15 @@@ S:    Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
  F:    Documentation/devicetree/bindings/usb/cdns,usb3.yaml
  F:    drivers/usb/cdns3/
 +X:    drivers/usb/cdns3/cdnsp*
 +
 +CADENCE USBSSP DRD IP DRIVER
 +M:    Pawel Laszczak <pawell@cadence.com>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
 +F:    drivers/usb/cdns3/
 +X:    drivers/usb/cdns3/cdns3*
  
  CADET FM/AM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
@@@ -3917,10 -3930,8 +3917,10 @@@ T:    git git://git.kernel.org/pub/scm/lin
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  F:    Documentation/devicetree/bindings/net/can/
  F:    drivers/net/can/
 +F:    include/linux/can/bittiming.h
  F:    include/linux/can/dev.h
  F:    include/linux/can/led.h
 +F:    include/linux/can/length.h
  F:    include/linux/can/platform/
  F:    include/linux/can/rx-offload.h
  F:    include/uapi/linux/can/error.h
@@@ -3936,7 -3947,6 +3936,7 @@@ W:      https://github.com/linux-ca
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  F:    Documentation/networking/can.rst
 +F:    include/linux/can/can-ml.h
  F:    include/linux/can/core.h
  F:    include/linux/can/skb.h
  F:    include/net/netns/can.h
@@@ -4072,6 -4082,7 +4072,6 @@@ W:      http://www.ibm.com/developerworks/po
  F:    arch/powerpc/include/asm/cell*.h
  F:    arch/powerpc/include/asm/spu*.h
  F:    arch/powerpc/include/uapi/asm/spu*.h
 -F:    arch/powerpc/oprofile/*cell*
  F:    arch/powerpc/platforms/cell/
  
  CELLWISE CW2015 BATTERY DRIVER
@@@ -4293,7 -4304,7 +4293,7 @@@ S:      Maintaine
  F:    .clang-format
  
  CLANG/LLVM BUILD SUPPORT
 -M:    Nathan Chancellor <natechancellor@gmail.com>
 +M:    Nathan Chancellor <nathan@kernel.org>
  M:    Nick Desaulniers <ndesaulniers@google.com>
  L:    clang-built-linux@googlegroups.com
  S:    Supported
@@@ -4434,6 -4445,17 +4434,17 @@@ M:    Miguel Ojeda <miguel.ojeda.sandonis@
  S:    Maintained
  F:    include/linux/compiler_attributes.h
  
+ COMPUTE EXPRESS LINK (CXL)
+ M:    Alison Schofield <alison.schofield@intel.com>
+ M:    Vishal Verma <vishal.l.verma@intel.com>
+ M:    Ira Weiny <ira.weiny@intel.com>
+ M:    Ben Widawsky <ben.widawsky@intel.com>
+ M:    Dan Williams <dan.j.williams@intel.com>
+ L:    linux-cxl@vger.kernel.org
+ S:    Maintained
+ F:    drivers/cxl/
+ F:    include/uapi/linux/cxl_mem.h
  CONEXANT ACCESSRUNNER USB DRIVER
  L:    accessrunner-general@lists.sourceforge.net
  S:    Orphan
@@@ -4457,7 -4479,7 +4468,7 @@@ F:      include/linux/console
  
  CONTROL GROUP (CGROUP)
  M:    Tejun Heo <tj@kernel.org>
 -M:    Li Zefan <lizefan@huawei.com>
 +M:    Zefan Li <lizefan.x@bytedance.com>
  M:    Johannes Weiner <hannes@cmpxchg.org>
  L:    cgroups@vger.kernel.org
  S:    Maintained
@@@ -4481,9 -4503,11 +4492,9 @@@ F:     block/blk-throttle.
  F:    include/linux/blk-cgroup.h
  
  CONTROL GROUP - CPUSET
 -M:    Li Zefan <lizefan@huawei.com>
 +M:    Zefan Li <lizefan.x@bytedance.com>
  L:    cgroups@vger.kernel.org
  S:    Maintained
 -W:    http://www.bullopensource.org/cpuset/
 -W:    http://oss.sgi.com/projects/cpusets/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  F:    Documentation/admin-guide/cgroup-v1/cpusets.rst
  F:    include/linux/cpuset.h
@@@ -4611,7 -4635,6 +4622,7 @@@ L:      linux-samsung-soc@vger.kernel.or
  S:    Supported
  F:    arch/arm/mach-exynos/pm.c
  F:    drivers/cpuidle/cpuidle-exynos.c
 +F:    include/linux/platform_data/cpuidle-exynos.h
  
  CPUIDLE DRIVER - ARM PSCI
  M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
@@@ -4927,7 -4950,7 +4938,7 @@@ F:      Documentation/networking/decnet.rs
  F:    net/decnet/
  
  DECSTATION PLATFORM SUPPORT
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  L:    linux-mips@vger.kernel.org
  S:    Maintained
  W:    http://www.linux-mips.org/wiki/DECstation
@@@ -4936,12 -4959,12 +4947,12 @@@ F:   arch/mips/include/asm/dec
  F:    arch/mips/include/asm/mach-dec/
  
  DEFXX FDDI NETWORK DRIVER
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  S:    Maintained
  F:    drivers/net/fddi/defxx.*
  
  DEFZA FDDI NETWORK DRIVER
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  S:    Maintained
  F:    drivers/net/fddi/defza.*
  
@@@ -4958,17 -4981,17 +4969,17 @@@ M:   Matthew Garrett <mjg59@srcf.ucam.org
  M:    Pali Rohár <pali@kernel.org>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/dell-laptop.c
 +F:    drivers/platform/x86/dell/dell-laptop.c
  
  DELL LAPTOP FREEFALL DRIVER
  M:    Pali Rohár <pali@kernel.org>
  S:    Maintained
 -F:    drivers/platform/x86/dell-smo8800.c
 +F:    drivers/platform/x86/dell/dell-smo8800.c
  
  DELL LAPTOP RBTN DRIVER
  M:    Pali Rohár <pali@kernel.org>
  S:    Maintained
 -F:    drivers/platform/x86/dell-rbtn.*
 +F:    drivers/platform/x86/dell/dell-rbtn.*
  
  DELL LAPTOP SMM DRIVER
  M:    Pali Rohár <pali@kernel.org>
@@@ -4980,26 -5003,26 +4991,26 @@@ DELL REMOTE BIOS UPDATE DRIVE
  M:    Stuart Hayes <stuart.w.hayes@gmail.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/dell_rbu.c
 +F:    drivers/platform/x86/dell/dell_rbu.c
  
  DELL SMBIOS DRIVER
  M:    Pali Rohár <pali@kernel.org>
  M:    Mario Limonciello <mario.limonciello@dell.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/dell-smbios.*
 +F:    drivers/platform/x86/dell/dell-smbios.*
  
  DELL SMBIOS SMM DRIVER
  M:    Mario Limonciello <mario.limonciello@dell.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/dell-smbios-smm.c
 +F:    drivers/platform/x86/dell/dell-smbios-smm.c
  
  DELL SMBIOS WMI DRIVER
  M:    Mario Limonciello <mario.limonciello@dell.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/dell-smbios-wmi.c
 +F:    drivers/platform/x86/dell/dell-smbios-wmi.c
  F:    tools/wmi/dell-smbios-example.c
  
  DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)
@@@ -5007,12 -5030,12 +5018,12 @@@ M:   Stuart Hayes <stuart.w.hayes@gmail.c
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    Documentation/driver-api/dcdbas.rst
 -F:    drivers/platform/x86/dcdbas.*
 +F:    drivers/platform/x86/dell/dcdbas.*
  
  DELL WMI DESCRIPTOR DRIVER
  M:    Mario Limonciello <mario.limonciello@dell.com>
  S:    Maintained
 -F:    drivers/platform/x86/dell-wmi-descriptor.c
 +F:    drivers/platform/x86/dell/dell-wmi-descriptor.c
  
  DELL WMI SYSMAN DRIVER
  M:    Divya Bharathi <divya.bharathi@dell.com>
@@@ -5021,13 -5044,13 +5032,13 @@@ M:   Prasanth Ksr <prasanth.ksr@dell.com
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-class-firmware-attributes
 -F:    drivers/platform/x86/dell-wmi-sysman/
 +F:    drivers/platform/x86/dell/dell-wmi-sysman/
  
  DELL WMI NOTIFICATIONS DRIVER
  M:    Matthew Garrett <mjg59@srcf.ucam.org>
  M:    Pali Rohár <pali@kernel.org>
  S:    Maintained
 -F:    drivers/platform/x86/dell-wmi.c
 +F:    drivers/platform/x86/dell/dell-wmi.c
  
  DELTA ST MEDIA DRIVER
  M:    Hugues Fruchet <hugues.fruchet@st.com>
@@@ -5269,7 -5292,6 +5280,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/dma/
  F:    Documentation/driver-api/dmaengine/
  F:    drivers/dma/
 +F:    include/linux/dma/
  F:    include/linux/dmaengine.h
  F:    include/linux/of_dma.h
  
@@@ -5773,7 -5795,6 +5784,7 @@@ F:      drivers/gpu/drm/vboxvideo
  DRM DRIVER FOR VMWARE VIRTUAL GPU
  M:    "VMware Graphics" <linux-graphics-maintainer@vmware.com>
  M:    Roland Scheidegger <sroland@vmware.com>
 +M:    Zack Rusin <zackr@vmware.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  T:    git git://people.freedesktop.org/~sroland/linux
@@@ -5975,8 -5996,8 +5986,8 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/stm
  
  DRM DRIVERS FOR TI KEYSTONE
 -M:    Jyri Sarha <jsarha@ti.com>
 -M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
 +M:    Jyri Sarha <jyri.sarha@iki.fi>
 +M:    Tomi Valkeinen <tomba@kernel.org>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -5986,15 -6007,15 +5997,15 @@@ F:   Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/tidss/
  
  DRM DRIVERS FOR TI LCDC
 -M:    Jyri Sarha <jsarha@ti.com>
 -R:    Tomi Valkeinen <tomi.valkeinen@ti.com>
 +M:    Jyri Sarha <jyri.sarha@iki.fi>
 +R:    Tomi Valkeinen <tomba@kernel.org>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/tilcdc/
  F:    drivers/gpu/drm/tilcdc/
  
  DRM DRIVERS FOR TI OMAP
 -M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
 +M:    Tomi Valkeinen <tomba@kernel.org>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/ti/
@@@ -6047,6 -6068,14 +6058,6 @@@ T:     git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/xlnx/
  F:    drivers/gpu/drm/xlnx/
  
 -DRM DRIVERS FOR ZTE ZX
 -M:    Shawn Guo <shawnguo@kernel.org>
 -L:    dri-devel@lists.freedesktop.org
 -S:    Maintained
 -T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/display/zte,vou.txt
 -F:    drivers/gpu/drm/zte/
 -
  DRM PANEL DRIVERS
  M:    Thierry Reding <thierry.reding@gmail.com>
  R:    Sam Ravnborg <sam@ravnborg.org>
@@@ -6206,7 -6235,7 +6217,7 @@@ F:      include/linux/dim.
  F:    lib/dim/
  
  DZ DECSTATION DZ11 SERIAL DRIVER
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  S:    Maintained
  F:    drivers/tty/serial/dz.*
  
@@@ -6456,9 -6485,9 +6467,9 @@@ S:      Maintaine
  F:    drivers/edac/skx_*.[ch]
  
  EDAC-TI
 -M:    Tero Kristo <t-kristo@ti.com>
 +M:    Tero Kristo <kristo@kernel.org>
  L:    linux-edac@vger.kernel.org
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/edac/ti_edac.c
  
  EDIROL UA-101/UA-1000 DRIVER
@@@ -6845,9 -6874,6 +6856,9 @@@ F:      include/linux/fs.
  F:    include/linux/fs_types.h
  F:    include/uapi/linux/fs.h
  F:    include/uapi/linux/openat2.h
 +X:    fs/io-wq.c
 +X:    fs/io-wq.h
 +X:    fs/io_uring.c
  
  FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:    Riku Voipio <riku.voipio@iki.fi>
@@@ -7362,6 -7388,13 +7373,6 @@@ M:     Kieran Bingham <kbingham@kernel.org
  S:    Supported
  F:    scripts/gdb/
  
 -GDT SCSI DISK ARRAY CONTROLLER DRIVER
 -M:    Achim Leubner <achim_leubner@adaptec.com>
 -L:    linux-scsi@vger.kernel.org
 -S:    Supported
 -W:    http://www.icp-vortex.com/
 -F:    drivers/scsi/gdt*
 -
  GEMTEK FM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
@@@ -7907,12 -7940,6 +7918,12 @@@ F:    drivers/hid
  F:    include/linux/hid*
  F:    include/uapi/linux/hid*
  
 +HID PLAYSTATION DRIVER
 +M:    Roderick Colenbrander <roderick.colenbrander@sony.com>
 +L:    linux-input@vger.kernel.org
 +S:    Supported
 +F:    drivers/hid/hid-playstation.c
 +
  HID SENSOR HUB DRIVERS
  M:    Jiri Kosina <jikos@kernel.org>
  M:    Jonathan Cameron <jic23@kernel.org>
@@@ -8144,7 -8171,7 +8155,7 @@@ F:      net/hsr
  HT16K33 LED CONTROLLER DRIVER
  M:    Robin van der Gracht <robin@protonic.nl>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/display/ht16k33.txt
 +F:    Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml
  F:    drivers/auxdisplay/ht16k33.c
  
  HTCPEN TOUCHSCREEN DRIVER
@@@ -8862,6 -8889,7 +8873,6 @@@ F:      drivers/mfd/intel_pmc_bxt.
  F:    include/linux/mfd/intel_pmc_bxt.h
  
  INTEL C600 SERIES SAS CONTROLLER DRIVER
 -M:    Intel SCU Linux support <intel-linux-scu@intel.com>
  M:    Artur Paszkiewicz <artur.paszkiewicz@intel.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
@@@ -8919,6 -8947,7 +8930,6 @@@ L:      linux-gpio@vger.kernel.or
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
  F:    drivers/gpio/gpio-ich.c
 -F:    drivers/gpio/gpio-intel-mid.c
  F:    drivers/gpio/gpio-merrifield.c
  F:    drivers/gpio/gpio-ml-ioh.c
  F:    drivers/gpio/gpio-pch.c
@@@ -8991,11 -9020,9 +9002,11 @@@ INTEL IPU3 CSI-2 CIO2 DRIVE
  M:    Yong Zhi <yong.zhi@intel.com>
  M:    Sakari Ailus <sakari.ailus@linux.intel.com>
  M:    Bingbu Cao <bingbu.cao@intel.com>
 +M:    Dan Scally <djrscally@gmail.com>
  R:    Tianshu Qiu <tian.shu.qiu@intel.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/userspace-api/media/v4l/pixfmt-srggb10-ipu3.rst
  F:    drivers/media/pci/intel/ipu3/
  
@@@ -9042,17 -9069,6 +9053,17 @@@ F:    drivers/crypto/keembay/keembay-ocs-a
  F:    drivers/crypto/keembay/ocs-aes.c
  F:    drivers/crypto/keembay/ocs-aes.h
  
 +INTEL KEEM BAY OCS HCU CRYPTO DRIVER
 +M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
 +M:    Declan Murphy <declan.murphy@intel.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/crypto/intel,keembay-ocs-hcu.yaml
 +F:    drivers/crypto/keembay/Kconfig
 +F:    drivers/crypto/keembay/Makefile
 +F:    drivers/crypto/keembay/keembay-ocs-hcu-core.c
 +F:    drivers/crypto/keembay/ocs-hcu.c
 +F:    drivers/crypto/keembay/ocs-hcu.h
 +
  INTEL MANAGEMENT ENGINE (mei)
  M:    Tomas Winkler <tomas.winkler@intel.com>
  L:    linux-kernel@vger.kernel.org
@@@ -9090,6 -9106,7 +9101,6 @@@ M:      Andy Shevchenko <andy@kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
  F:    drivers/gpio/gpio-*cove.c
 -F:    drivers/gpio/gpio-msic.c
  
  INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
  M:    Andy Shevchenko <andy@kernel.org>
@@@ -9218,11 -9235,10 +9229,11 @@@ F:   include/linux/tboot.
  
  INTEL SGX
  M:    Jarkko Sakkinen <jarkko@kernel.org>
 +R:    Dave Hansen <dave.hansen@linux.intel.com>
  L:    linux-sgx@vger.kernel.org
  S:    Supported
  Q:    https://patchwork.kernel.org/project/intel-sgx/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-sgx.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/sgx
  F:    Documentation/x86/sgx.rst
  F:    arch/x86/entry/vdso/vsgx.S
  F:    arch/x86/include/uapi/asm/sgx.h
@@@ -9290,7 -9306,6 +9301,7 @@@ F:      include/uapi/linux/iommu.
  
  IO_URING
  M:    Jens Axboe <axboe@kernel.dk>
 +R:    Pavel Begunkov <asml.silence@gmail.com>
  L:    io-uring@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.dk/linux-block
@@@ -9298,7 -9313,6 +9309,7 @@@ T:      git git://git.kernel.dk/liburin
  F:    fs/io-wq.c
  F:    fs/io-wq.h
  F:    fs/io_uring.c
 +F:    include/linux/io_uring.h
  F:    include/uapi/linux/io_uring.h
  
  IPMI SUBSYSTEM
@@@ -9556,18 -9570,16 +9567,18 @@@ F:   Documentation/hwmon/k8temp.rs
  F:    drivers/hwmon/k8temp.c
  
  KASAN
 -M:    Andrey Ryabinin <aryabinin@virtuozzo.com>
 +M:    Andrey Ryabinin <ryabinin.a.a@gmail.com>
  R:    Alexander Potapenko <glider@google.com>
 +R:    Andrey Konovalov <andreyknvl@gmail.com>
  R:    Dmitry Vyukov <dvyukov@google.com>
  L:    kasan-dev@googlegroups.com
  S:    Maintained
  F:    Documentation/dev-tools/kasan.rst
 -F:    arch/*/include/asm/kasan.h
 +F:    arch/*/include/asm/*kasan.h
  F:    arch/*/mm/kasan_init*
  F:    include/linux/kasan*.h
 -F:    lib/test_kasan.c
 +F:    lib/Kconfig.kasan
 +F:    lib/test_kasan*.c
  F:    mm/kasan/
  F:    scripts/Makefile.kasan
  
@@@ -9582,7 -9594,7 +9593,7 @@@ F:      scripts/kconfig
  
  KCOV
  R:    Dmitry Vyukov <dvyukov@google.com>
 -R:    Andrey Konovalov <andreyknvl@google.com>
 +R:    Andrey Konovalov <andreyknvl@gmail.com>
  L:    kasan-dev@googlegroups.com
  S:    Maintained
  F:    Documentation/dev-tools/kcov.rst
@@@ -9733,7 -9745,6 +9744,7 @@@ M:      Aleksandar Markovic <aleksandar.qemu
  L:    linux-mips@vger.kernel.org
  L:    kvm@vger.kernel.org
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
  F:    arch/mips/include/asm/kvm*
  F:    arch/mips/include/uapi/asm/kvm*
  F:    arch/mips/kvm/
@@@ -10367,8 -10378,6 +10378,8 @@@ LOCKING PRIMITIVE
  M:    Peter Zijlstra <peterz@infradead.org>
  M:    Ingo Molnar <mingo@redhat.com>
  M:    Will Deacon <will@kernel.org>
 +R:    Waiman Long <longman@redhat.com>
 +R:    Boqun Feng <boqun.feng@gmail.com> (LOCKDEP)
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
@@@ -10689,8 -10698,6 +10700,8 @@@ M:   Sunil Goutham <sgoutham@marvell.com
  M:    Linu Cherian <lcherian@marvell.com>
  M:    Geetha sowjanya <gakula@marvell.com>
  M:    Jerin Jacob <jerinj@marvell.com>
 +M:    hariprasad <hkelam@marvell.com>
 +M:    Subbaraya Sundeep <sbhatta@marvell.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst
@@@ -11180,15 -11187,6 +11191,15 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
  F:    drivers/i2c/busses/i2c-mt65xx.c
  
 +MEDIATEK IOMMU DRIVER
 +M:    Yong Wu <yong.wu@mediatek.com>
 +L:    iommu@lists.linux-foundation.org
 +L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/devicetree/bindings/iommu/mediatek*
 +F:    drivers/iommu/mtk_iommu*
 +F:    include/dt-bindings/memory/mt*-port.h
 +
  MEDIATEK JPEG DRIVER
  M:    Rick Chang <rick.chang@mediatek.com>
  M:    Bin Liu <bin.liu@mediatek.com>
@@@ -11278,8 -11276,6 +11289,8 @@@ L:   linux-usb@vger.kernel.or
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/usb/mediatek,*
 +F:    drivers/usb/host/xhci-mtk*
  F:    drivers/usb/mtu3/
  
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
@@@ -11561,7 -11557,7 +11572,7 @@@ L:   linux-amlogic@lists.infradead.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
 -F:    drivers/media/meson/ge2d/
 +F:    drivers/media/platform/meson/ge2d/
  
  MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
  M:    Liang Yang <liang.yang@amlogic.com>
@@@ -11613,6 -11609,7 +11624,6 @@@ F:   drivers/dma/at_hdmac.
  F:    drivers/dma/at_hdmac_regs.h
  F:    drivers/dma/at_xdmac.c
  F:    include/dt-bindings/dma/at91.h
 -F:    include/linux/platform_data/dma-atmel.h
  
  MICROCHIP AT91 SERIAL DRIVER
  M:    Richard Genoud <richard.genoud@gmail.com>
@@@ -11698,9 -11695,9 +11709,9 @@@ F:   drivers/video/fbdev/atmel_lcdfb.
  F:    include/video/atmel_lcdc.h
  
  MICROCHIP MCP16502 PMIC DRIVER
 -M:    Andrei Stefanescu <andrei.stefanescu@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@microchip.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 +S:    Supported
  F:    Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt
  F:    drivers/regulator/mcp16502.c
  
@@@ -11815,31 -11812,12 +11826,31 @@@ S:        Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
  F:    drivers/platform/surface/
  
 +MICROSOFT SURFACE HOT-PLUG DRIVER
 +M:    Maximilian Luz <luzmaximilian@gmail.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/surface/surface_hotplug.c
 +
  MICROSOFT SURFACE PRO 3 BUTTON DRIVER
  M:    Chen Yu <yu.c.chen@intel.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Supported
  F:    drivers/platform/surface/surfacepro3_button.c
  
 +MICROSOFT SURFACE SYSTEM AGGREGATOR SUBSYSTEM
 +M:    Maximilian Luz <luzmaximilian@gmail.com>
 +S:    Maintained
 +W:    https://github.com/linux-surface/surface-aggregator-module
 +C:    irc://chat.freenode.net/##linux-surface
 +F:    Documentation/driver-api/surface_aggregator/
 +F:    drivers/platform/surface/aggregator/
 +F:    drivers/platform/surface/surface_acpi_notify.c
 +F:    drivers/platform/surface/surface_aggregator_cdev.c
 +F:    include/linux/surface_acpi_notify.h
 +F:    include/linux/surface_aggregator/
 +F:    include/uapi/linux/surface_aggregator/
 +
  MICROTEK X6 SCANNER
  M:    Oliver Neukum <oliver@neukum.org>
  S:    Maintained
@@@ -11862,11 -11840,9 +11873,11 @@@ L: linux-media@vger.kernel.or
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
  F:    Documentation/driver-api/media/drivers/ccs/
 +F:    Documentation/userspace-api/media/drivers/ccs.rst
  F:    drivers/media/i2c/ccs-pll.c
  F:    drivers/media/i2c/ccs-pll.h
  F:    drivers/media/i2c/ccs/
 +F:    include/uapi/linux/ccs.h
  F:    include/uapi/linux/smiapp.h
  
  MIPS
@@@ -11932,7 -11908,8 +11943,7 @@@ L:   linux-mips@vger.kernel.or
  S:    Maintained
  F:    arch/mips/include/asm/mach-loongson2ef/
  F:    arch/mips/loongson2ef/
 -F:    drivers/*/*/*loongson2*
 -F:    drivers/*/*loongson2*
 +F:    drivers/cpufreq/loongson2_cpufreq.c
  
  MIPS/LOONGSON64 ARCHITECTURE
  M:    Huacai Chen <chenhuacai@kernel.org>
@@@ -11941,6 -11918,8 +11952,6 @@@ L:   linux-mips@vger.kernel.or
  S:    Maintained
  F:    arch/mips/include/asm/mach-loongson64/
  F:    arch/mips/loongson64/
 -F:    drivers/*/*/*loongson3*
 -F:    drivers/*/*loongson3*
  F:    drivers/irqchip/irq-loongson*
  F:    drivers/platform/mips/cpu_hwmon.c
  
@@@ -12549,14 -12528,6 +12560,14 @@@ F: include/net/nfc
  F:    include/uapi/linux/nfc.h
  F:    net/nfc/
  
 +NFC VIRTUAL NCI DEVICE DRIVER
 +M:    Bongsu Jeon <bongsu.jeon@samsung.com>
 +L:    netdev@vger.kernel.org
 +L:    linux-nfc@lists.01.org (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/nfc/virtual_ncidev.c
 +F:    tools/testing/selftests/nci/
 +
  NFS, SUNRPC, AND LOCKD CLIENTS
  M:    Trond Myklebust <trond.myklebust@hammerspace.com>
  M:    Anna Schumaker <anna.schumaker@netapp.com>
@@@ -12784,13 -12755,6 +12795,13 @@@ F: drivers/iio/gyro/fxas21002c_core.
  F:    drivers/iio/gyro/fxas21002c_i2c.c
  F:    drivers/iio/gyro/fxas21002c_spi.c
  
 +NXP i.MX CLOCK DRIVERS
 +M:    Abel Vesa <abel.vesa@nxp.com>
 +L:    linux-clk@vger.kernel.org
 +L:    linux-imx@nxp.com
 +S:    Maintained
 +F:    drivers/clk/imx/
 +
  NXP i.MX 8MQ DCSS DRIVER
  M:    Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>
  R:    Lucas Stach <l.stach@pengutronix.de>
@@@ -12875,7 -12839,6 +12886,7 @@@ F:   drivers/net/dsa/ocelot/
  F:    drivers/net/ethernet/mscc/
  F:    include/soc/mscc/ocelot*
  F:    net/dsa/tag_ocelot.c
 +F:    net/dsa/tag_ocelot_8021q.c
  F:    tools/testing/selftests/drivers/net/ocelot/*
  
  OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
@@@ -12935,7 -12898,7 +12946,7 @@@ S:   Orpha
  F:    drivers/video/fbdev/omap/
  
  OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT
 -M:    Roger Quadros <rogerq@ti.com>
 +M:    Roger Quadros <rogerq@kernel.org>
  M:    Tony Lindgren <tony@atomide.com>
  L:    linux-omap@vger.kernel.org
  S:    Maintained
@@@ -13155,7 -13118,7 +13166,7 @@@ M:   Jacopo Mondi <jacopo@jmondi.org
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/i2c/ov5647.yaml
 +F:    Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml
  F:    drivers/media/i2c/ov5647.c
  
  OMNIVISION OV5670 SENSOR DRIVER
@@@ -13354,6 -13317,15 +13365,6 @@@ S:  Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  F:    sound/drivers/opl4/
  
 -OPROFILE
 -M:    Robert Richter <rric@kernel.org>
 -L:    oprofile-list@lists.sf.net
 -S:    Maintained
 -F:    arch/*/include/asm/oprofile*.h
 -F:    arch/*/oprofile/
 -F:    drivers/oprofile/
 -F:    include/linux/oprofile.h
 -
  ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
  M:    Mark Fasheh <mark@fasheh.com>
  M:    Joel Becker <jlbec@evilplan.org>
@@@ -14016,6 -13988,15 +14027,6 @@@ L:  linux-input@vger.kernel.or
  S:    Maintained
  F:    drivers/hid/hid-picolcd*
  
 -PICOXCELL SUPPORT
 -M:    Jamie Iles <jamie@jamieiles.com>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Supported
 -T:    git git://github.com/jamieiles/linux-2.6-ji.git
 -F:    arch/arm/boot/dts/picoxcell*
 -F:    arch/arm/mach-picoxcell/
 -F:    drivers/crypto/picoxcell*
 -
  PIDFD API
  M:    Christian Brauner <christian@brauner.io>
  L:    linux-kernel@vger.kernel.org
@@@ -14122,6 -14103,7 +14133,6 @@@ L:   linux-mips@vger.kernel.or
  S:    Odd Fixes
  F:    arch/mips/boot/dts/img/pistachio*
  F:    arch/mips/configs/pistachio*_defconfig
 -F:    arch/mips/include/asm/mach-pistachio/
  F:    arch/mips/pistachio/
  
  PKTCDVD DRIVER
@@@ -14644,12 -14626,6 +14655,12 @@@ L: netdev@vger.kernel.or
  S:    Supported
  F:    drivers/staging/qlge/
  
 +QLOGIC QLGE 10Gb ETHERNET DRIVER
 +M:    Coiby Xu <coiby.xu@gmail.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/networking/device_drivers/qlogic/qlge.rst
 +
  QM1D1B0004 MEDIA DRIVER
  M:    Akihiro Tsukada <tskd08@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -15001,18 -14977,6 +15012,18 @@@ F: drivers/media/i2c/max9271.
  F:    drivers/media/i2c/max9271.h
  F:    drivers/media/i2c/rdacm20.c
  
 +RDACM21 Camera Sensor
 +M:    Jacopo Mondi <jacopo+renesas@jmondi.org>
 +M:    Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
 +M:    Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
 +M:    Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/rdacm2x-gmsl.yaml
 +F:    drivers/media/i2c/max9271.c
 +F:    drivers/media/i2c/max9271.h
 +F:    drivers/media/i2c/rdacm21.c
 +
  RDC R-321X SoC
  M:    Florian Fainelli <florian@openwrt.org>
  S:    Maintained
@@@ -15737,6 -15701,7 +15748,6 @@@ F:   drivers/media/i2c/s5k5baf.
  SAMSUNG S5P Security SubSystem (SSS) DRIVER
  M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Vladimir Zapolskiy <vz@mleia.com>
 -M:    Kamil Konieczny <k.konieczny@samsung.com>
  L:    linux-crypto@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
@@@ -16284,14 -16249,6 +16295,14 @@@ S: Maintaine
  F:    Documentation/fb/sm712fb.rst
  F:    drivers/video/fbdev/sm712*
  
 +SILVACO I3C DUAL-ROLE MASTER
 +M:    Miquel Raynal <miquel.raynal@bootlin.com>
 +M:    Conor Culhane <conor.culhane@silvaco.com>
 +L:    linux-i3c@lists.infradead.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml
 +F:    drivers/i3c/master/svc-i3c-master.c
 +
  SIMPLE FIRMWARE INTERFACE (SFI)
  S:    Obsolete
  W:    http://simplefirmware.org/
@@@ -16596,7 -16553,6 +16607,7 @@@ M:   Sakari Ailus <sakari.ailus@linux.int
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/imx258.yaml
  F:    drivers/media/i2c/imx258.c
  
  SONY IMX274 SENSOR DRIVER
@@@ -16622,15 -16578,6 +16633,15 @@@ S: Maintaine
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/i2c/imx319.c
  
 +SONY IMX334 SENSOR DRIVER
 +M:    Paul J. Murphy <paul.j.murphy@intel.com>
 +M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
 +F:    drivers/media/i2c/imx334.c
 +
  SONY IMX355 SENSOR DRIVER
  M:    Tianshu Qiu <tian.shu.qiu@intel.com>
  L:    linux-media@vger.kernel.org
@@@ -17001,6 -16948,12 +17012,6 @@@ F:  include/linux/static_call*.
  F:    kernel/jump_label.c
  F:    kernel/static_call.c
  
 -STEC S1220 SKD DRIVER
 -M:    Damien Le Moal <Damien.LeMoal@wdc.com>
 -L:    linux-block@vger.kernel.org
 -S:    Maintained
 -F:    drivers/block/skd*[ch]
 -
  STI AUDIO (ASoC) DRIVERS
  M:    Arnaud Pouliquen <arnaud.pouliquen@st.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -17270,7 -17223,6 +17281,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
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/arm,sc[mp]i.txt
@@@ -17278,7 -17230,6 +17289,7 @@@ F:   drivers/clk/clk-sc[mp]i.
  F:    drivers/cpufreq/sc[mp]i-cpufreq.c
  F:    drivers/firmware/arm_scmi/
  F:    drivers/firmware/arm_scpi.c
 +F:    drivers/regulator/scmi-regulator.c
  F:    drivers/reset/reset-scmi.c
  F:    include/linux/sc[mp]i_protocol.h
  F:    include/trace/events/scmi.h
@@@ -17562,14 -17513,6 +17573,14 @@@ M: Laxman Dewangan <ldewangan@nvidia.co
  S:    Supported
  F:    drivers/spi/spi-tegra*
  
 +TEGRA QUAD SPI DRIVER
 +M:    Thierry Reding <thierry.reding@gmail.com>
 +M:    Jonathan Hunter <jonathanh@nvidia.com>
 +M:    Sowjanya Komatineni <skomatineni@nvidia.com>
 +L:    linux-tegra@vger.kernel.org
 +S:    Maintained
 +F:    drivers/spi/spi-tegra210-quad.c
 +
  TEGRA VIDEO DRIVER
  M:    Thierry Reding <thierry.reding@gmail.com>
  M:    Jonathan Hunter <jonathanh@nvidia.com>
@@@ -17640,7 -17583,7 +17651,7 @@@ F:   include/linux/dma/k3-psil.
  
  TEXAS INSTRUMENTS' SYSTEM CONTROL INTERFACE (TISCI) PROTOCOL DRIVER
  M:    Nishanth Menon <nm@ti.com>
 -M:    Tero Kristo <t-kristo@ti.com>
 +M:    Tero Kristo <kristo@kernel.org>
  M:    Santosh Shilimkar <ssantosh@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained
@@@ -17662,15 -17605,6 +17673,15 @@@ F: include/dt-bindings/soc/ti,sci_pm_do
  F:    include/linux/soc/ti/ti_sci_inta_msi.h
  F:    include/linux/soc/ti/ti_sci_protocol.h
  
 +TEXAS INSTRUMENTS TPS23861 PoE PSE DRIVER
 +M:    Robert Marko <robert.marko@sartura.hr>
 +M:    Luka Perkov <luka.perkov@sartura.hr>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/ti,tps23861.yaml
 +F:    Documentation/hwmon/tps23861.rst
 +F:    drivers/hwmon/tps23861.c
 +
  THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
@@@ -17724,7 -17658,7 +17735,7 @@@ F:   drivers/thermal/gov_power_allocator.
  F:    include/trace/events/thermal_power_allocator.h
  
  THINKPAD ACPI EXTRAS DRIVER
 -M:    Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
 +M:    Henrique de Moraes Holschuh <hmh@hmh.eng.br>
  L:    ibm-acpi-devel@lists.sourceforge.net
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
@@@ -17793,9 -17727,9 +17804,9 @@@ S:   Maintaine
  F:    drivers/clk/clk-cdce706.c
  
  TI CLOCK DRIVER
 -M:    Tero Kristo <t-kristo@ti.com>
 +M:    Tero Kristo <kristo@kernel.org>
  L:    linux-omap@vger.kernel.org
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/clk/ti/
  F:    include/linux/clk/ti.h
  
@@@ -17921,7 -17855,7 +17932,7 @@@ M:   Dan Murphy <dmurphy@ti.com
  L:    linux-can@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/can/tcan4x5x.txt
 -F:    drivers/net/can/m_can/tcan4x5x.c
 +F:    drivers/net/can/m_can/tcan4x5x*
  
  TI TRF7970A NFC DRIVER
  M:    Mark Greer <mgreer@animalcreek.com>
@@@ -18185,7 -18119,7 +18196,7 @@@ F:   Documentation/networking/tuntap.rs
  F:    arch/um/os-Linux/drivers/
  
  TURBOCHANNEL SUBSYSTEM
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  M:    Ralf Baechle <ralf@linux-mips.org>
  L:    linux-mips@vger.kernel.org
  S:    Maintained
@@@ -19818,7 -19752,7 +19829,7 @@@ F:   Documentation/admin-guide/blockdev/z
  F:    drivers/block/zram/
  
  ZS DECSTATION Z85C30 SERIAL DRIVER
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  S:    Maintained
  F:    drivers/tty/serial/zs.*