Merge tag 'vfs-6.9.ntfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

Pull ntfs update from Christian Brauner:
 "This removes the old ntfs driver. The new ntfs3 driver is a full
  replacement that was merged over two years ago. We've went through
  various userspace and either they use ntfs3 or they use the fuse
  version of ntfs and thus build neither ntfs nor ntfs3. I think that's
  a clear sign that we should risk removing the legacy ntfs driver.

  Quoting from Arch Linux and Debian:

   - Debian does neither build the legacy ntfs nor the new ntfs3:

     "Not currently built with Debian's kernel packages, 'ntfs' has been
      symlinked to 'ntfs-3g' as it relates to fstab and mount commands.

      Debian kernels are built without support of the ntfs3 driver
      developed by Paragon Software."  (cf. [2])

   - Archlinux provides ntfs3 as their default since 5.15:

     "All officially supported kernels with versions 5.15 or newer are
      built with CONFIG_NTFS3_FS=m and thus support it. Before 5.15,
      NTFS read and write support is provided by the NTFS-3G FUSE file
      system."  (cf. [1]).

  It's unmaintained apart from various odd fixes as well. Worst case we
  have to reintroduce it if someone really has a valid dependency on it.
  But it's worth trying to see whether we can remove it"

Link: https://wiki.archlinux.org/title/NTFS
Link: https://wiki.debian.org/NTFS
* tag 'vfs-6.9.ntfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  fs: remove NTFS classic from docum. index
  fs: Remove NTFS classic

diff --combined CREDITS
index df8d6946739f68655a8b077f0ebcc4bf4612944b,12e829ccc1abf908889509a948557a441a3f90f9..3c2bb55847c607f027ddc6c50c259545327c0fe8
--- 1/CREDITS
--- 2/CREDITS
+++ b/CREDITS
@@@ -63,6 -63,11 +63,11 @@@ D: dosfs, LILO, some fd features, ATM, 
  S: Buenos Aires
  S: Argentina
  
+ NTFS FILESYSTEM
+ N: Anton Altaparmakov
+ E: [email protected]
+ D: NTFS filesystem
+ 
  N: Tim Alpaerts
  E: [email protected]
  D: 802.2 class II logical link control layer,
@@@ -2161,19 -2166,6 +2166,19 @@@ N: Mike Kravet
  E: [email protected]
  D: Maintenance and development of the hugetlb subsystem
  
 +N: Seth Jennings
 +E: [email protected]
 +D: Creation and maintenance of zswap
 +
 +N: Dan Streetman
 +E: [email protected]
 +D: Maintenance and development of zswap
 +D: Creation and maintenance of the zpool API
 +
 +N: Vitaly Wool
 +E: [email protected]
 +D: Maintenance and development of zswap
 +
  N: Andreas S. Krebs
  E: [email protected]
  D: CYPRESS CY82C693 chipset IDE, Digital's PC-Alpha 164SX boards

diff --combined MAINTAINERS
index a94abdf6e9a311b05fd3a9bccddb142e50aac20e,a137641f10967f27760e607fef8ab21a567fa803..7f0b462d85a414a7fe3babd94ab6999e4051813b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1395,7 -1395,6 +1395,7 @@@ F:      drivers/hwmon/max31760.
  
  ANALOGBITS PLL LIBRARIES
  M:    Paul Walmsley <[email protected]>
 +M:    Samuel Holland <[email protected]>
  S:    Supported
  F:    drivers/clk/analogbits/*
  F:    include/linux/clk/analogbits*
@@@ -2157,7 -2156,7 +2157,7 @@@ M:      Shawn Guo <[email protected]
  M:    Sascha Hauer <[email protected]>
  R:    Pengutronix Kernel Team <[email protected]>
  R:    Fabio Estevam <[email protected]>
 -R:    NXP Linux Team <[email protected]>
 +L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
@@@ -3169,10 -3168,10 +3169,10 @@@ F:   drivers/hwmon/asus-ec-sensors.
  
  ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
  M:    Corentin Chary <[email protected]>
 -L:    [email protected]
 +M:    Luke D. Jones <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://acpi4asus.sf.net
 +W:    https://asus-linux.org/
  F:    drivers/platform/x86/asus*.c
  F:    drivers/platform/x86/eeepc*.c
  
@@@ -4170,14 -4169,14 +4170,14 @@@ F:   drivers/firmware/broadcom/tee_bnxt_f
  F:    drivers/net/ethernet/broadcom/bnxt/
  F:    include/linux/firmware/broadcom/tee_bnxt_fw.h
  
 -BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
 -M:    Arend van Spriel <[email protected]>
 -M:    Franky Lin <[email protected]>
 -M:    Hante Meuleman <[email protected]>
 +BROADCOM BRCM80211 IEEE802.11 WIRELESS DRIVERS
 +M:    Arend van Spriel <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/wireless/broadcom/brcm80211/
 +F:    include/linux/platform_data/brcmfmac.h
  
  BROADCOM BRCMSTB GPIO DRIVER
  M:    Doug Berger <[email protected]>
@@@ -4548,7 -4547,7 +4548,7 @@@ F:      drivers/net/ieee802154/ca8210.
  
  CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
  M:    David Howells <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Supported
  F:    Documentation/filesystems/caching/cachefiles.rst
  F:    fs/cachefiles/
@@@ -5379,7 -5378,7 +5379,7 @@@ CONTROL GROUP - MEMORY RESOURCE CONTROL
  M:    Johannes Weiner <[email protected]>
  M:    Michal Hocko <[email protected]>
  M:    Roman Gushchin <[email protected]>
 -M:    Shakeel Butt <shakeel[email protected]>
 +M:    Shakeel Butt <shakeel[email protected]>
  R:    Muchun Song <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -5611,11 -5610,6 +5611,11 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml
  F:    drivers/net/can/ctucanfd/
  
 +CVE ASSIGNMENT CONTACT
 +M:    CVE Assignment Team <[email protected]>
 +S:    Maintained
 +F:    Documentation/process/cve.rst
 +
  CW1200 WLAN driver
  S:    Orphan
  F:    drivers/net/wireless/st/cw1200/
@@@ -5964,6 -5958,7 +5964,6 @@@ S:      Maintaine
  F:    drivers/platform/x86/dell/dell-wmi-descriptor.c
  
  DELL WMI HARDWARE PRIVACY SUPPORT
 -M:    Perry Yuan <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -7960,13 -7955,12 +7960,13 @@@ L:   [email protected]
  S:    Maintained
  F:    rust/kernel/net/phy.rs
  
 -EXEC & BINFMT API
 +EXEC & BINFMT API, ELF
  R:    Eric Biederman <[email protected]>
  R:    Kees Cook <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve
 +F:    Documentation/userspace-api/ELF.rst
  F:    fs/*binfmt_*.c
  F:    fs/exec.c
  F:    include/linux/binfmts.h
@@@ -8229,8 -8223,7 +8229,8 @@@ F:      include/linux/iomap.
  
  FILESYSTEMS [NETFS LIBRARY]
  M:    David Howells <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +R:    Jeff Layton <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/filesystems/caching/
@@@ -8496,7 -8489,7 +8496,7 @@@ FREESCALE IMX / MXC FEC DRIVE
  M:    Wei Fang <[email protected]>
  R:    Shenwei Wang <[email protected]>
  R:    Clark Wang <[email protected]>
 -R:    NXP Linux Team <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/fsl,fec.yaml
@@@ -8531,7 -8524,7 +8531,7 @@@ F:      drivers/i2c/busses/i2c-imx.
  FREESCALE IMX LPI2C DRIVER
  M:    Dong Aisheng <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
  F:    drivers/i2c/busses/i2c-imx-lpi2c.c
@@@ -10097,7 -10090,7 +10097,7 @@@ L:   [email protected]
  S:    Maintained
  W:    https://i2c.wiki.kernel.org/
  Q:    https://patchwork.ozlabs.org/project/linux-i2c/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git
  F:    Documentation/devicetree/bindings/i2c/
  F:    drivers/i2c/algos/
  F:    drivers/i2c/busses/
@@@ -10289,7 -10282,7 +10289,7 @@@ F:   drivers/scsi/ibmvscsi/ibmvscsi
  F:    include/scsi/viosrp.h
  
  IBM Power Virtual SCSI Device Target Driver
 -M:    Michael Cyr <mikecyr@linux.ibm.com>
 +M:    Tyrel Datwyler <tyreld@linux.ibm.com>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -10735,7 -10728,7 +10735,7 @@@ INTEL DRM I915 DRIVER (Meteor Lake, DG
  M:    Jani Nikula <[email protected]>
  M:    Joonas Lahtinen <[email protected]>
  M:    Rodrigo Vivi <[email protected]>
 -M:    Tvrtko Ursulin <t[email protected]>
 +M:    Tvrtko Ursulin <t[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://drm.pages.freedesktop.org/intel-docs/
@@@ -10807,11 -10800,11 +10807,11 @@@ F:        drivers/gpio/gpio-tangier.
  
  INTEL GVT-g DRIVERS (Intel GPU Virtualization)
  M:    Zhenyu Wang <[email protected]>
 -M:    Zhi Wang <zhi.a.wang@intel.com>
 +M:    Zhi Wang <zhi.wang.linux@gmail.com>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -W:    https://01.org/igvt-g
 +W:    https://github.com/intel/gvt-linux/wiki
  T:    git https://github.com/intel/gvt-linux.git
  F:    drivers/gpu/drm/i915/gvt/
  
@@@ -11133,6 -11126,7 +11133,6 @@@ S:   Supporte
  F:    drivers/net/wireless/intel/iwlegacy/
  
  INTEL WIRELESS WIFI LINK (iwlwifi)
 -M:    Gregory Greenman <[email protected]>
  M:    Miri Korenblit <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -11730,7 -11724,6 +11730,7 @@@ F:   fs/smb/server
  KERNEL UNIT TESTING FRAMEWORK (KUnit)
  M:    Brendan Higgins <[email protected]>
  M:    David Gow <[email protected]>
 +R:    Rae Moar <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -12517,6 -12510,7 +12517,6 @@@ F:   arch/powerpc/include/asm/livepatch.
  F:    include/linux/livepatch.h
  F:    kernel/livepatch/
  F:    kernel/module/livepatch.c
 -F:    lib/livepatch/
  F:    samples/livepatch/
  F:    tools/testing/selftests/livepatch/
  
@@@ -12908,8 -12902,6 +12908,8 @@@ M:   Alejandro Colomar <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    http://www.kernel.org/doc/man-pages
 +T:    git git://git.kernel.org/pub/scm/docs/man-pages/man-pages.git
 +T:    git git://www.alejandro-colomar.es/src/alx/linux/man-pages/man-pages.git
  
  MANAGEMENT COMPONENT TRANSPORT PROTOCOL (MCTP)
  M:    Jeremy Kerr <[email protected]>
@@@ -14111,17 -14103,6 +14111,17 @@@ F: mm
  F:    tools/mm/
  F:    tools/testing/selftests/mm/
  
 +MEMORY MAPPING
 +M:    Andrew Morton <[email protected]>
 +R:    Liam R. Howlett <[email protected]>
 +R:    Vlastimil Babka <[email protected]>
 +R:    Lorenzo Stoakes <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +W:    http://www.linux-mm.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
 +F:    mm/mmap.c
 +
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    Miquel Raynal <[email protected]>
  M:    Richard Weinberger <[email protected]>
@@@ -14380,7 -14361,7 +14380,7 @@@ MICROCHIP MCP16502 PMIC DRIVE
  M:    Claudiu Beznea <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 -F:    Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt
 +F:    Documentation/devicetree/bindings/regulator/microchip,mcp16502.yaml
  F:    drivers/regulator/mcp16502.c
  
  MICROCHIP MCP3564 ADC DRIVER
@@@ -15196,7 -15177,6 +15196,7 @@@ F:   Documentation/networking/net_cacheli
  F:    drivers/connector/
  F:    drivers/net/
  F:    include/dt-bindings/net/
 +F:    include/linux/cn_proc.h
  F:    include/linux/etherdevice.h
  F:    include/linux/fcdevice.h
  F:    include/linux/fddidevice.h
@@@ -15204,7 -15184,6 +15204,7 @@@ F:   include/linux/hippidevice.
  F:    include/linux/if_*
  F:    include/linux/inetdevice.h
  F:    include/linux/netdevice.h
 +F:    include/uapi/linux/cn_proc.h
  F:    include/uapi/linux/if_*
  F:    include/uapi/linux/netdevice.h
  X:    drivers/net/wireless/
@@@ -15253,8 -15232,6 +15253,8 @@@ F:   Documentation/networking
  F:    Documentation/networking/net_cachelines/
  F:    Documentation/process/maintainer-netdev.rst
  F:    Documentation/userspace-api/netlink/
 +F:    include/linux/framer/framer-provider.h
 +F:    include/linux/framer/framer.h
  F:    include/linux/in.h
  F:    include/linux/indirect_call_wrapper.h
  F:    include/linux/net.h
@@@ -15342,7 -15319,7 +15342,7 @@@ K:   \bmdo
  NETWORKING [MPTCP]
  M:    Matthieu Baerts <[email protected]>
  M:    Mat Martineau <[email protected]>
 -R:    Geliang Tang <geliang[email protected]>
 +R:    Geliang Tang <geliang@kernel.org>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -15589,16 -15566,6 +15589,6 @@@ W:  https://github.com/davejiang/linux/w
  T:    git https://github.com/davejiang/linux.git
  F:    drivers/ntb/hw/intel/
  
- NTFS FILESYSTEM
- M:    Anton Altaparmakov <[email protected]>
- R:    Namjae Jeon <[email protected]>
- L:    [email protected]
- S:    Supported
- W:    http://www.tuxera.com/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git
- F:    Documentation/filesystems/ntfs.rst
- F:    fs/ntfs/
- 
  NTFS3 FILESYSTEM
  M:    Konstantin Komarov <[email protected]>
  L:    [email protected]
@@@ -15727,7 -15694,7 +15717,7 @@@ F:   drivers/iio/gyro/fxas21002c_spi.
  NXP i.MX 7D/6SX/6UL/93 AND VF610 ADC DRIVER
  M:    Haibo Chen <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml
  F:    Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml
@@@ -15764,7 -15731,7 +15754,7 @@@ F:   drivers/gpu/drm/imx/dcss
  NXP i.MX 8QXP ADC DRIVER
  M:    Cai Huoqing <[email protected]>
  M:    Haibo Chen <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml
@@@ -15772,7 -15739,7 +15762,7 @@@ F:   drivers/iio/adc/imx8qxp-adc.
  
  NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
  M:    Mirela Rabulea <[email protected]>
 -R:    NXP Linux Team <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
@@@ -15782,7 -15749,7 +15772,7 @@@ NXP i.MX CLOCK DRIVER
  M:    Abel Vesa <[email protected]>
  R:    Peng Fan <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx
  F:    Documentation/devicetree/bindings/clock/imx*
@@@ -16743,7 -16710,6 +16733,7 @@@ F:   drivers/pci/controller/dwc/*layersca
  PCI DRIVER FOR FU740
  M:    Paul Walmsley <[email protected]>
  M:    Greentime Hu <[email protected]>
 +M:    Samuel Holland <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml
@@@ -16856,7 -16822,6 +16846,7 @@@ F:   drivers/pci/controller/dwc/*designwa
  
  PCI DRIVER FOR TI DRA7XX/J721E
  M:    Vignesh Raghavendra <[email protected]>
 +R:    Siddharth Vadapalli <[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
@@@ -16881,8 -16846,9 +16871,8 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pcie-xilinx-cpm.c
  
  PCI ENDPOINT SUBSYSTEM
 -M:    Lorenzo Pieralisi <lpieralisi@kernel.org>
 +M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  M:    Krzysztof Wilczyński <[email protected]>
 -R:    Manivannan Sadhasivam <[email protected]>
  R:    Kishon Vijay Abraham I <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -17202,7 -17168,7 +17192,7 @@@ R:   John Garry <[email protected]
  R:    Will Deacon <[email protected]>
  R:    James Clark <[email protected]>
  R:    Mike Leach <[email protected]>
 -R:    Leo Yan <leo.yan@linaro.org>
 +R:    Leo Yan <leo.yan@linux.dev>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    tools/build/feature/test-libopencsd.c
@@@ -17549,7 -17515,6 +17539,7 @@@ F:   Documentation/devicetree/bindings/po
  F:    drivers/power/supply/
  F:    include/linux/power/
  F:    include/linux/power_supply.h
 +F:    tools/testing/selftests/power_supply/
  
  POWERNV OPERATOR PANEL LCD DISPLAY DRIVER
  M:    Suraj Jitindar Singh <[email protected]>
@@@ -17997,34 -17962,33 +17987,34 @@@ F:        drivers/media/tuners/qt1010
  
  QUALCOMM ATH12K WIRELESS DRIVER
  M:    Kalle Valo <[email protected]>
 -M:    Jeff Johnson <[email protected]>
 +M:    Jeff Johnson <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath12k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath12k/
 +N:    ath12k
  
  QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
  M:    Kalle Valo <[email protected]>
 -M:    Jeff Johnson <[email protected]>
 +M:    Jeff Johnson <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 -F:    Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml
  F:    drivers/net/wireless/ath/ath10k/
 +N:    ath10k
  
  QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
  M:    Kalle Valo <[email protected]>
 -M:    Jeff Johnson <[email protected]>
 +M:    Jeff Johnson <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath11k
  B:    https://wireless.wiki.kernel.org/en/users/Drivers/ath11k/bugreport
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 -F:    Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml
  F:    drivers/net/wireless/ath/ath11k/
 +N:    ath11k
  
  QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
  M:    Toke Høiland-Jørgensen <[email protected]>
@@@ -18107,6 -18071,7 +18097,6 @@@ F:   drivers/net/ethernet/qualcomm/emac
  
  QUALCOMM ETHQOS ETHERNET DRIVER
  M:    Vinod Koul <[email protected]>
 -R:    Bhupesh Sharma <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -18453,7 -18418,7 +18443,7 @@@ S:   Supporte
  F:    drivers/infiniband/sw/rdmavt
  
  RDS - RELIABLE DATAGRAM SOCKETS
 -M:    Santosh Shilimkar <santosh.shilimkar@oracle.com>
 +M:    Allison Henderson <allison.henderson@oracle.com>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
@@@ -19120,7 -19085,6 +19110,7 @@@ F:   Documentation/rust
  F:    rust/
  F:    samples/rust/
  F:    scripts/*rust*
 +F:    tools/testing/selftests/rust/
  K:    \b(?i:rust)\b
  
  RXRPC SOCKETS (AF_RXRPC)
@@@ -19656,7 -19620,7 +19646,7 @@@ F:   drivers/mmc/host/sdhci-of-at91.
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) NXP i.MX DRIVER
  M:    Haibo Chen <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdhci-esdhc-imx.c
@@@ -19991,15 -19955,36 +19981,15 @@@ S:        Maintaine
  F:    drivers/watchdog/simatic-ipc-wdt.c
  
  SIFIVE DRIVERS
 -M:    Palmer Dabbelt <[email protected]>
  M:    Paul Walmsley <[email protected]>
 +M:    Samuel Holland <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    drivers/dma/sf-pdma/
  N:    sifive
 +K:    fu[57]40
  K:    [^@]sifive
  
 -SIFIVE CACHE DRIVER
 -M:    Conor Dooley <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/cache/sifive,ccache0.yaml
 -F:    drivers/cache/sifive_ccache.c
 -
 -SIFIVE FU540 SYSTEM-ON-CHIP
 -M:    Paul Walmsley <[email protected]>
 -M:    Palmer Dabbelt <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git
 -N:    fu540
 -K:    fu540
 -
 -SIFIVE PDMA DRIVER
 -M:    Green Wan <[email protected]>
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
 -F:    drivers/dma/sf-pdma/
 -
 -
  SILEAD TOUCHSCREEN DRIVER
  M:    Hans de Goede <[email protected]>
  L:    [email protected]
@@@ -20208,8 -20193,8 +20198,8 @@@ F:   Documentation/devicetree/bindings/ne
  F:    drivers/net/ethernet/socionext/sni_ave.c
  
  SOCIONEXT (SNI) NETSEC NETWORK DRIVER
 -M:    Jassi Brar <[email protected]>
  M:    Ilias Apalodimas <[email protected]>
 +M:    Masahisa Kojima <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/socionext,synquacer-netsec.yaml
@@@ -20554,7 -20539,6 +20544,7 @@@ F:   Documentation/translations/sp_SP
  
  SPARC + UltraSPARC (sparc/sparc64)
  M:    "David S. Miller" <[email protected]>
 +M:    Andreas Larsson <[email protected]>
  L:    [email protected]
  S:    Maintained
  Q:    http://patchwork.ozlabs.org/project/sparclinux/list/
@@@ -22011,14 -21995,6 +22001,14 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/ds90*
  F:    include/media/i2c/ds90*
  
 +TI HDC302X HUMIDITY DRIVER
 +M:    Javier Carrasco <[email protected]>
 +M:    Li peiyu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/humidity/ti,hdc3020.yaml
 +F:    drivers/iio/humidity/hdc3020.c
 +
  TI ICSSG ETHERNET DRIVER (ICSSG)
  R:    MD Danish Anwar <[email protected]>
  R:    Roger Quadros <[email protected]>
@@@ -22874,8 -22850,9 +22864,8 @@@ S:   Maintaine
  F:    drivers/usb/typec/mux/pi3usb30532.c
  
  USB TYPEC PORT CONTROLLER DRIVERS
 -M:    Guenter Roeck <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/usb/typec/tcpm/
  
  USB UHCI DRIVER
@@@ -24352,6 -24329,13 +24342,6 @@@ T:  git git://git.kernel.org/pub/scm/lin
  F:    Documentation/filesystems/zonefs.rst
  F:    fs/zonefs/
  
 -ZPOOL COMPRESSED PAGE STORAGE API
 -M:    Dan Streetman <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    include/linux/zpool.h
 -F:    mm/zpool.c
 -
  ZR36067 VIDEO FOR LINUX DRIVER
  M:    Corentin Labbe <[email protected]>
  L:    [email protected]
@@@ -24403,9 -24387,7 +24393,9 @@@ M:   Nhat Pham <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/admin-guide/mm/zswap.rst
 +F:    include/linux/zpool.h
  F:    include/linux/zswap.h
 +F:    mm/zpool.c
  F:    mm/zswap.c
  
  THE REST