Merge tag 'm68knommu-for-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg...

Pull m68knommu updates from Greg Ungerer:
 "A couple of minor changes.

  One to remove the long dead uclinux.org web address and email list
  from the MAINTAINERS entry for UCLINUX.

  The other to remove dead config options in the m68knommu Kconfig"

* tag 'm68knommu-for-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: Kconfig.machine: remove obsolete configs ROMBASE and ROMSIZE
  MAINTAINERS: drop uclinux.org

diff --combined MAINTAINERS
index e3b90b2a438c1b30617a97885e12ed70cdcaa82a,eb16b704400b604421508b6900bf7af1c4f88acb..4e93707933000b591cad42b113773e93342d23b6
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -964,14 -964,6 +964,14 @@@ Q:       https://patchwork.kernel.org/project
  F:    drivers/infiniband/hw/efa/
  F:    include/uapi/rdma/efa-abi.h
  
 +AMD CDX BUS DRIVER
 +M:    Nipun Gupta <[email protected]>
 +M:    Nikhil Agarwal <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/bus/xlnx,versal-net-cdx.yaml
 +F:    drivers/cdx/*
 +F:    include/linux/cdx/*
 +
  AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
  M:    Tom Lendacky <[email protected]>
  M:    John Allen <[email protected]>
@@@ -1049,15 -1041,6 +1049,15 @@@ F:    drivers/gpu/drm/amd/include/vi_struc
  F:    include/uapi/linux/kfd_ioctl.h
  F:    include/uapi/linux/kfd_sysfs.h
  
 +AMD PDS CORE DRIVER
 +M:    Shannon Nelson <[email protected]>
 +M:    Brett Creeley <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/networking/device_drivers/ethernet/amd/pds_core.rst
 +F:    drivers/net/ethernet/amd/pds_core/
 +F:    include/linux/pds/
 +
  AMD SPI DRIVER
  M:    Sanjay R Mehta <[email protected]>
  S:    Maintained
@@@ -1088,7 -1071,7 +1088,7 @@@ M:      Naveen Krishna Chatradhi <naveenkris
  R:    Carlos Bilbao <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/x86/amd_hsmp.rst
 +F:    Documentation/arch/x86/amd_hsmp.rst
  F:    arch/x86/include/asm/amd_hsmp.h
  F:    arch/x86/include/uapi/asm/amd_hsmp.h
  F:    drivers/platform/x86/amd/hsmp.c
@@@ -1244,6 -1227,12 +1244,6 @@@ F:     Documentation/devicetree/bindings/ii
  F:    drivers/iio/addac/ad74413r.c
  F:    include/dt-bindings/iio/addac/adi,ad74413r.h
  
 -ANALOG DEVICES INC AD9389B DRIVER
 -M:    Hans Verkuil <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/media/i2c/ad9389b*
 -
  ANALOG DEVICES INC ADA4250 DRIVER
  M:    Antoniu Miclaus <[email protected]>
  L:    [email protected]
@@@ -1439,6 -1428,11 +1439,6 @@@ S:     Supporte
  F:    drivers/clk/analogbits/*
  F:    include/linux/clk/analogbits*
  
 -ANDROID CONFIG FRAGMENTS
 -M:    Rob Herring <[email protected]>
 -S:    Supported
 -F:    kernel/configs/android*
 -
  ANDROID DRIVERS
  M:    Greg Kroah-Hartman <[email protected]>
  M:    Arve Hjønnevåg <[email protected]>
@@@ -2078,7 -2072,6 +2078,7 @@@ M:      Alexander Sverdlin <alexander.sverdl
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/iio/adc/cirrus,ep9301-adc.yaml
 +F:    Documentation/devicetree/bindings/sound/cirrus,ep9301-*
  F:    arch/arm/boot/compressed/misc-ep93xx.h
  F:    arch/arm/mach-ep93xx/
  F:    drivers/iio/adc/ep93xx_adc.c
@@@ -2098,6 -2091,7 +2098,6 @@@ F:      arch/arm/boot/dts/cx92755
  N:    digicolor
  
  ARM/CORESIGHT FRAMEWORK AND DRIVERS
 -M:    Mathieu Poirier <[email protected]>
  M:    Suzuki K Poulose <[email protected]>
  R:    Mike Leach <[email protected]>
  R:    Leo Yan <[email protected]>
@@@ -2281,7 -2275,7 +2281,7 @@@ F:      arch/arm/boot/dts/intel-ixp
  F:    arch/arm/mach-ixp4xx/
  F:    drivers/bus/intel-ixp4xx-eb.c
  F:    drivers/clocksource/timer-ixp4xx.c
 -F:    drivers/crypto/ixp4xx_crypto.c
 +F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  F:    drivers/gpio/gpio-ixp4xx.c
  F:    drivers/irqchip/irq-ixp4xx.c
  
@@@ -2610,12 -2604,6 +2610,12 @@@ F:    include/dt-bindings/*/qcom
  F:    include/linux/*/qcom*
  F:    include/linux/soc/qcom/
  
 +ARM/QUALCOMM CHROMEBOOK SUPPORT
 +R:    [email protected]
 +F:    arch/arm64/boot/dts/qcom/sc7180*
 +F:    arch/arm64/boot/dts/qcom/sc7280*
 +F:    arch/arm64/boot/dts/qcom/sdm845-cheza*
 +
  ARM/RDA MICRO ARCHITECTURE
  M:    Manivannan Sadhasivam <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2666,7 -2654,6 +2666,7 @@@ F:      arch/arm64/boot/dts/renesas
  F:    arch/riscv/boot/dts/renesas/
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
 +K:    \brenesas,
  
  ARM/RISCPC ARCHITECTURE
  M:    Russell King <[email protected]>
@@@ -4444,13 -4431,6 +4444,13 @@@ S:    Maintaine
  F:    drivers/scsi/BusLogic.*
  F:    drivers/scsi/FlashPoint.*
  
 +BXCAN CAN NETWORK DRIVER
 +M:    Dario Binacchi <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/can/st,stm32-bxcan.yaml
 +F:    drivers/net/can/bxcan.c
 +
  C-MEDIA CMI8788 DRIVER
  M:    Clemens Ladisch <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -4925,7 -4905,6 +4925,7 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/cirrus,cs*
  F:    include/dt-bindings/sound/cs*
 +F:    include/sound/cs*
  F:    sound/pci/hda/cs*
  F:    sound/pci/hda/hda_cs_dsp_ctl.*
  F:    sound/soc/codecs/cs*
@@@ -5961,6 -5940,11 +5961,6 @@@ F:     drivers/devfreq/event
  F:    include/dt-bindings/pmu/exynos_ppmu.h
  F:    include/linux/devfreq-event.h
  
 -DEVICE NUMBER REGISTRY
 -M:    Torben Mathiasen <[email protected]>
 -S:    Maintained
 -W:    http://lanana.org/docs/device-list/index.html
 -
  DEVICE RESOURCE MANAGEMENT HELPERS
  M:    Hans de Goede <[email protected]>
  R:    Matti Vaittinen <[email protected]>
@@@ -6223,7 -6207,6 +6223,7 @@@ DOCUMENTATION REPORTING ISSUE
  M:    Thorsten Leemhuis <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/admin-guide/quickly-build-trimmed-linux.rst
  F:    Documentation/admin-guide/reporting-issues.rst
  
  DOCUMENTATION SCRIPTS
@@@ -6335,9 -6318,7 +6335,9 @@@ F:      drivers/base
  F:    fs/debugfs/
  F:    fs/sysfs/
  F:    include/linux/debugfs.h
 +F:    include/linux/fwnode.h
  F:    include/linux/kobj*
 +F:    include/linux/property.h
  F:    lib/kobj*
  
  DRIVERS FOR OMAP ADAPTIVE VOLTAGE SCALING (AVS)
@@@ -6537,7 -6518,6 +6537,7 @@@ L:      [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +B:    https://gitlab.freedesktop.org/drm/msm/-/issues
  T:    git https://gitlab.freedesktop.org/drm/msm.git
  F:    Documentation/devicetree/bindings/display/msm/
  F:    drivers/gpu/drm/msm/
@@@ -6557,13 -6537,6 +6557,13 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/panel/sony,acx424akp.yaml
  F:    drivers/gpu/drm/panel/panel-novatek-nt35560.c
  
 +DRM DRIVER FOR NOVATEK NT36523 PANELS
 +M:    Jianhua Lu <[email protected]>
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
 +F:    drivers/gpu/drm/panel/panel-novatek-nt36523.c
 +
  DRM DRIVER FOR NOVATEK NT36672A PANELS
  M:    Sumit Semwal <[email protected]>
  S:    Maintained
@@@ -6644,16 -6617,6 +6644,16 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/panel/samsung,lms397kf04.yaml
  F:    drivers/gpu/drm/panel/panel-samsung-db7430.c
  
 +DRM DRIVER FOR SAMSUNG MIPI DSIM BRIDGE
 +M:    Inki Dae <[email protected]>
 +M:    Jagan Teki <[email protected]>
 +M:    Marek Szyprowski <[email protected]>
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/bridge/samsung,mipi-dsim.yaml
 +F:    drivers/gpu/drm/bridge/samsung-dsim.c
 +F:    include/drm/bridge/samsung-dsim.h
 +
  DRM DRIVER FOR SAMSUNG S6D27A1 PANELS
  M:    Markuss Broks <[email protected]>
  S:    Maintained
@@@ -6861,7 -6824,6 +6861,7 @@@ S:      Maintaine
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/bridge/
  F:    drivers/gpu/drm/bridge/
 +F:    include/drm/drm_bridge.h
  
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <[email protected]>
@@@ -6954,7 -6916,6 +6954,7 @@@ F:      drivers/phy/mediatek/phy-mtk-mipi
  
  DRM DRIVERS FOR NVIDIA TEGRA
  M:    Thierry Reding <[email protected]>
 +M:    Mikko Perttunen <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -7083,7 -7044,7 +7083,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/xlnx/
  
  DRM PANEL DRIVERS
 -M:    Thierry Reding <[email protected]>
 +M:    Neil Armstrong <[email protected]>
  R:    Sam Ravnborg <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -7564,6 -7525,12 +7564,6 @@@ T:     git git://linuxtv.org/media_tree.gi
  F:    Documentation/admin-guide/media/em28xx*
  F:    drivers/media/usb/em28xx/
  
 -EMBEDDED LINUX
 -M:    Olivia Mackall <[email protected]>
 -M:    David Woodhouse <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -
  EMMC CMDQ HOST CONTROLLER INTERFACE (CQHCI) DRIVER
  M:    Adrian Hunter <[email protected]>
  M:    Ritesh Harjani <[email protected]>
@@@ -7761,7 -7728,6 +7761,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    Documentation/filesystems/ext4/
  F:    fs/ext4/
  F:    include/trace/events/ext4.h
 +F:    include/uapi/linux/ext4.h
  
  Extended Verification Module (EVM)
  M:    Mimi Zohar <[email protected]>
@@@ -7988,11 -7954,10 +7988,11 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    drivers/target/sbp/
  
  FIREWIRE SUBSYSTEM
 -M:    Stefan Richter <[email protected]>
 +M:    Takashi Sakamoto <[email protected]>
 +M:    Takashi Sakamoto <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://ieee1394.wiki.kernel.org/
 +W:    http://ieee1394.docs.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git
  F:    drivers/firewire/
  F:    include/linux/firewire.h
@@@ -8135,7 -8100,7 +8135,7 @@@ M:      Pankaj Gupta <[email protected]
  M:    Gaurav Jain <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/crypto/fsl-sec4.txt
 +F:    Documentation/devicetree/bindings/crypto/fsl,sec-v4.0*
  F:    drivers/crypto/caam/
  
  FREESCALE COLDFIRE M5441X MMC DRIVER
@@@ -8283,23 -8248,6 +8283,23 @@@ S:    Maintaine
  F:    drivers/soc/fsl/qe/
  F:    include/soc/fsl/qe/
  
 +FREESCALE QUICC ENGINE QMC DRIVER
 +M:    Herve Codina <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml
 +F:    drivers/soc/fsl/qe/qmc.c
 +F:    include/soc/fsl/qe/qmc.h
 +
 +FREESCALE QUICC ENGINE TSA DRIVER
 +M:    Herve Codina <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml
 +F:    drivers/soc/fsl/qe/tsa.c
 +F:    drivers/soc/fsl/qe/tsa.h
 +F:    include/dt-bindings/soc/cpm1-fsl,tsa.h
 +
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
  M:    Li Yang <[email protected]>
  L:    [email protected]
@@@ -8351,14 -8299,6 +8351,14 @@@ F:    sound/soc/fsl/fsl
  F:    sound/soc/fsl/imx*
  F:    sound/soc/fsl/mpc8610_hpcd.c
  
 +FREESCALE SOC SOUND QMC DRIVER
 +M:    Herve Codina <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/fsl,qmc-audio.yaml
 +F:    sound/soc/fsl/fsl_qmc_audio.c
 +
  FREESCALE USB PERIPHERAL DRIVERS
  M:    Li Yang <[email protected]>
  L:    [email protected]
@@@ -8478,6 -8418,14 +8478,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/platform/x86/fujitsu-laptop.c
  
 -FUJITSU M-5MO LS CAMERA ISP DRIVER
 -M:    Kyungmin Park <[email protected]>
 -M:    Heungjun Kim <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/media/i2c/m5mols/
 -F:    include/media/i2c/m5mols.h
 -
  FUJITSU TABLET EXTRAS
  M:    Robert Gerlach <[email protected]>
  L:    [email protected]
@@@ -8742,7 -8690,7 +8742,7 @@@ F:      drivers/input/touchscreen/goodix
  
  GOOGLE ETHERNET DRIVERS
  M:    Jeroen de Borst <[email protected]>
 -M:    Catherine Sullivan <csully@google.com>
 +M:    Praveen Kaligineedi <pkaligineedi@google.com>
  R:    Shailend Chand <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -8805,6 -8753,7 +8805,6 @@@ F:      Documentation/admin-guide/gpio
  F:    Documentation/devicetree/bindings/gpio/
  F:    Documentation/driver-api/gpio/
  F:    drivers/gpio/
 -F:    include/asm-generic/gpio.h
  F:    include/dt-bindings/gpio/
  F:    include/linux/gpio.h
  F:    include/linux/gpio/
@@@ -8991,17 -8940,6 +8991,17 @@@ Q:    http://patchwork.linuxtv.org/project
  T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/hackrf/
  
 +HANDSHAKE UPCALL FOR TRANSPORT LAYER SECURITY
 +M:    Chuck Lever <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/netlink/specs/handshake.yaml
 +F:    Documentation/networking/tls-handshake.rst
 +F:    include/net/handshake.h
 +F:    include/trace/events/handshake.h
 +F:    net/handshake/
 +
  HANTRO VPU CODEC DRIVER
  M:    Ezequiel Garcia <[email protected]>
  M:    Philipp Zabel <[email protected]>
@@@ -9582,7 -9520,6 +9582,7 @@@ S:      Supporte
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
  F:    Documentation/ABI/testing/debugfs-hyperv
 +F:    Documentation/devicetree/bindings/bus/microsoft,vmbus.yaml
  F:    Documentation/virt/hyperv
  F:    Documentation/networking/device_drivers/ethernet/microsoft/netvsc.rst
  F:    arch/arm64/hyperv
@@@ -9792,7 -9729,7 +9792,7 @@@ F:      include/linux/i3c
  IA64 (Itanium) PLATFORM
  L:    [email protected]
  S:    Orphan
 -F:    Documentation/ia64/
 +F:    Documentation/arch/ia64/
  F:    arch/ia64/
  
  IBM Operation Panel Input Driver
@@@ -9900,11 -9837,6 +9900,11 @@@ F:    drivers/crypto/vmx/ghash
  F:    drivers/crypto/vmx/ppc-xlate.pl
  F:    drivers/crypto/vmx/vmx.c
  
 +IBM Power VFIO Support
 +M:    Timothy Pearson <[email protected]>
 +S:    Supported
 +F:    drivers/vfio/vfio_iommu_spapr_tce.c
 +
  IBM ServeRAID RAID DRIVER
  S:    Orphan
  F:    drivers/scsi/ips.*
@@@ -10007,13 -9939,6 +10007,13 @@@ F:  Documentation/ABI/testing/sysfs-bus-
  F:    Documentation/devicetree/bindings/iio/adc/envelope-detector.yaml
  F:    drivers/iio/adc/envelope-detector.c
  
 +IIO LIGHT SENSOR GAIN-TIME-SCALE HELPERS
 +M:    Matti Vaittinen <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/iio/light/gain-time-scale-helper.c
 +F:    drivers/iio/light/gain-time-scale-helper.h
 +
  IIO MULTIPLEXER
  M:    Peter Rosin <[email protected]>
  L:    [email protected]
@@@ -10358,14 -10283,12 +10358,14 @@@ M:        Andy Shevchenko <[email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
 +F:    drivers/gpio/gpio-elkhartlake.c
  F:    drivers/gpio/gpio-ich.c
  F:    drivers/gpio/gpio-merrifield.c
  F:    drivers/gpio/gpio-ml-ioh.c
  F:    drivers/gpio/gpio-pch.c
  F:    drivers/gpio/gpio-sch.c
  F:    drivers/gpio/gpio-sodaville.c
 +F:    drivers/gpio/gpio-tangier.c
  
  INTEL GVT-g DRIVERS (Intel GPU Virtualization)
  M:    Zhenyu Wang <[email protected]>
@@@ -10458,7 -10381,7 +10458,7 @@@ INTEL IXP4XX CRYPTO SUPPOR
  M:    Corentin Labbe <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/crypto/ixp4xx_crypto.c
 +F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  
  INTEL ISHTP ECLITE DRIVER
  M:    Sumesh K Naduvalath <[email protected]>
@@@ -10493,11 -10416,11 +10493,11 @@@ INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVE
  M:    Daniele Alessandrelli <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/crypto/intel,keembay-ocs-aes.yaml
 -F:    drivers/crypto/keembay/Kconfig
 -F:    drivers/crypto/keembay/Makefile
 -F:    drivers/crypto/keembay/keembay-ocs-aes-core.c
 -F:    drivers/crypto/keembay/ocs-aes.c
 -F:    drivers/crypto/keembay/ocs-aes.h
 +F:    drivers/crypto/intel/keembay/Kconfig
 +F:    drivers/crypto/intel/keembay/Makefile
 +F:    drivers/crypto/intel/keembay/keembay-ocs-aes-core.c
 +F:    drivers/crypto/intel/keembay/ocs-aes.c
 +F:    drivers/crypto/intel/keembay/ocs-aes.h
  
  INTEL KEEM BAY OCS ECC CRYPTO DRIVER
  M:    Daniele Alessandrelli <[email protected]>
@@@ -10505,20 -10428,20 +10505,20 @@@ M:        Prabhjot Khurana <prabhjot.khurana@i
  M:    Mark Gross <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/crypto/intel,keembay-ocs-ecc.yaml
 -F:    drivers/crypto/keembay/Kconfig
 -F:    drivers/crypto/keembay/Makefile
 -F:    drivers/crypto/keembay/keembay-ocs-ecc.c
 +F:    drivers/crypto/intel/keembay/Kconfig
 +F:    drivers/crypto/intel/keembay/Makefile
 +F:    drivers/crypto/intel/keembay/keembay-ocs-ecc.c
  
  INTEL KEEM BAY OCS HCU CRYPTO DRIVER
  M:    Daniele Alessandrelli <[email protected]>
  M:    Declan Murphy <[email protected]>
  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
 +F:    drivers/crypto/intel/keembay/Kconfig
 +F:    drivers/crypto/intel/keembay/Makefile
 +F:    drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c
 +F:    drivers/crypto/intel/keembay/ocs-hcu.c
 +F:    drivers/crypto/intel/keembay/ocs-hcu.h
  
  INTEL THUNDER BAY EMMC PHY DRIVER
  M:    Nandhini Srikandan <[email protected]>
@@@ -10537,7 -10460,6 +10537,7 @@@ F:   drivers/watchdog/mei_wdt.
  F:    include/linux/mei_aux.h
  F:    include/linux/mei_cl_bus.h
  F:    include/uapi/linux/mei.h
 +F:    include/uapi/linux/mei_uuid.h
  F:    include/uapi/linux/uuid.h
  F:    samples/mei/*
  
@@@ -10726,7 -10648,7 +10726,7 @@@ L:   [email protected]
  S:    Supported
  W:    http://tboot.sourceforge.net
  T:    hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
 -F:    Documentation/x86/intel_txt.rst
 +F:    Documentation/arch/x86/intel_txt.rst
  F:    arch/x86/kernel/tboot.c
  F:    include/linux/tboot.h
  
@@@ -10737,7 -10659,7 +10737,7 @@@ L:   [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/intel-sgx/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/sgx
 -F:    Documentation/x86/sgx.rst
 +F:    Documentation/arch/x86/sgx.rst
  F:    arch/x86/entry/vdso/vsgx.S
  F:    arch/x86/include/asm/sgx.h
  F:    arch/x86/include/uapi/asm/sgx.h
@@@ -11601,6 -11523,16 +11601,6 @@@ F:  include/linux/kmemleak.
  F:    mm/kmemleak.c
  F:    samples/kmemleak/kmemleak-test.c
  
 -KMOD KERNEL MODULE LOADER - USERMODE HELPER
 -M:    Luis Chamberlain <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Maintained
 -F:    include/linux/kmod.h
 -F:    kernel/kmod.c
 -F:    lib/test_kmod.c
 -F:    tools/testing/selftests/kmod/
 -
  KMSAN
  M:    Alexander Potapenko <[email protected]>
  R:    Marco Elver <[email protected]>
@@@ -11962,7 -11894,6 +11962,7 @@@ M:   Scott Wood <[email protected]
  L:    [email protected]
  S:    Odd fixes
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
 +F:    Documentation/devicetree/bindings/cache/freescale-l2cache.txt
  F:    Documentation/devicetree/bindings/powerpc/fsl/
  F:    arch/powerpc/platforms/83xx/
  F:    arch/powerpc/platforms/85xx/
@@@ -12186,13 -12117,6 +12186,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml
  F:    drivers/pinctrl/pinctrl-loongson2.c
  
 +LOONGSON GPIO DRIVER
 +M:    Yinbo Zhu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
 +F:    drivers/gpio/gpio-loongson-64bit.c
 +
  LOONGSON-2 SOC SERIES CLOCK DRIVER
  M:    Yinbo Zhu <[email protected]>
  L:    [email protected]
@@@ -12352,7 -12276,7 +12352,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
  F:    Documentation/networking/mac80211-injection.rst
  F:    Documentation/networking/mac80211_hwsim/mac80211_hwsim.rst
 -F:    drivers/net/wireless/mac80211_hwsim.[ch]
 +F:    drivers/net/wireless/virtual/mac80211_hwsim.[ch]
  F:    include/net/mac80211.h
  F:    net/mac80211/
  
@@@ -13119,14 -13043,6 +13119,14 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/mediatek/
  
 +MEDIATEK ETHERNET PCS DRIVER
 +M:    Alexander Couzens <[email protected]>
 +M:    Daniel Golle <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/pcs/pcs-mtk-lynxi.c
 +F:    include/linux/pcs/pcs-mtk-lynxi.h
 +
  MEDIATEK I2C CONTROLLER DRIVER
  M:    Qii Wang <[email protected]>
  L:    [email protected]
@@@ -13251,11 -13167,8 +13251,11 @@@ MEDIATEK SWITCH DRIVE
  M:    Sean Wang <[email protected]>
  M:    Landen Chao <[email protected]>
  M:    DENG Qingfang <[email protected]>
 +M:    Daniel Golle <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    drivers/net/dsa/mt7530-mdio.c
 +F:    drivers/net/dsa/mt7530-mmio.c
  F:    drivers/net/dsa/mt7530.*
  F:    net/dsa/tag_mtk.c
  
@@@ -13456,14 -13369,13 +13456,14 @@@ F:        arch/powerpc/include/asm/membarrier.
  F:    include/uapi/linux/membarrier.h
  F:    kernel/sched/membarrier.c
  
 -MEMBLOCK
 +MEMBLOCK AND MEMORY MANAGEMENT INITIALIZATION
  M:    Mike Rapoport <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/core-api/boot-time-mm.rst
  F:    include/linux/memblock.h
  F:    mm/memblock.c
 +F:    mm/mm_init.c
  F:    tools/testing/memblock/
  
  MEMORY CONTROLLER DRIVERS
@@@ -13498,7 -13410,6 +13498,7 @@@ F:   include/linux/memory_hotplug.
  F:    include/linux/mm.h
  F:    include/linux/mmzone.h
  F:    include/linux/pagewalk.h
 +F:    include/trace/events/ksm.h
  F:    mm/
  F:    tools/mm/
  F:    tools/testing/selftests/mm/
@@@ -13507,7 -13418,6 +13507,7 @@@ VMALLO
  M:    Andrew Morton <[email protected]>
  R:    Uladzislau Rezki <[email protected]>
  R:    Christoph Hellwig <[email protected]>
 +R:    Lorenzo Stoakes <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://www.linux-mm.org
@@@ -13684,13 -13594,9 +13684,13 @@@ F: Documentation/devicetree/bindings/se
  F:    drivers/spi/spi-at91-usart.c
  
  MICROCHIP AUDIO ASOC DRIVERS
 -M:    Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@microchip.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 +F:    Documentation/devicetree/bindings/sound/atmel*
 +F:    Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt
 +F:    Documentation/devicetree/bindings/sound/microchip,sama7g5-*
 +F:    Documentation/devicetree/bindings/sound/mikroe,mikroe-proto.txt
  F:    sound/soc/atmel
  
  MICROCHIP CSI2DC DRIVER
@@@ -13863,10 -13769,9 +13863,10 @@@ S: Supporte
  F:    drivers/spi/spi-atmel.*
  
  MICROCHIP SSC DRIVER
 -M:    Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@microchip.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 +F:    Documentation/devicetree/bindings/misc/atmel-ssc.txt
  F:    drivers/misc/atmel-ssc.c
  F:    include/linux/atmel-ssc.h
  
@@@ -14179,11 -14084,8 +14179,11 @@@ L: [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-next
  F:    include/linux/module.h
 +F:    include/linux/kmod.h
  F:    kernel/module/
  F:    scripts/module*
 +F:    lib/test_kmod.c
 +F:    tools/testing/selftests/kmod/
  
  MONOLITHIC POWER SYSTEM PMIC DRIVER
  M:    Saravanan Sekar <[email protected]>
@@@ -14237,13 -14139,6 +14237,13 @@@ S: Odd Fixe
  F:    Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
  F:    drivers/net/ieee802154/mrf24j40.c
  
 +MSI EC DRIVER
 +M:    Nikita Kravets <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +W:    https://github.com/BeardOverflow/msi-ec
 +F:    drivers/platform/x86/msi-ec.*
 +
  MSI LAPTOP SUPPORT
  M:    "Lee, Chun-Yi" <[email protected]>
  L:    [email protected]
@@@ -14288,6 -14183,14 +14288,6 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/mtd/devices/docg3*
  
 -MT9M032 APTINA SENSOR DRIVER
 -M:    Laurent Pinchart <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/i2c/mt9m032.c
 -F:    include/media/i2c/mt9m032.h
 -
  MT9P031 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -14297,6 -14200,14 +14297,6 @@@ F:  Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/mt9p031.c
  F:    include/media/i2c/mt9p031.h
  
 -MT9T001 APTINA CAMERA SENSOR
 -M:    Laurent Pinchart <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/i2c/mt9t001.c
 -F:    include/media/i2c/mt9t001.h
 -
  MT9T112 APTINA CAMERA SENSOR
  M:    Jacopo Mondi <[email protected]>
  L:    [email protected]
@@@ -14683,14 -14594,11 +14683,14 @@@ F:        net/netlabel
  
  NETWORKING [MPTCP]
  M:    Matthieu Baerts <[email protected]>
 +M:    Mat Martineau <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://github.com/multipath-tcp/mptcp_net-next/wiki
  B:    https://github.com/multipath-tcp/mptcp_net-next/issues
 +T:    git https://github.com/multipath-tcp/mptcp_net-next.git export-net
 +T:    git https://github.com/multipath-tcp/mptcp_net-next.git export
  F:    Documentation/networking/mptcp-sysctl.rst
  F:    include/net/mptcp.h
  F:    include/trace/events/mptcp.h
@@@ -14753,6 -14661,7 +14753,6 @@@ L:   [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/nfc/
  F:    drivers/nfc/
 -F:    include/linux/platform_data/nfcmrvl.h
  F:    include/net/nfc/
  F:    include/uapi/linux/nfc.h
  F:    net/nfc/
@@@ -14835,7 -14744,7 +14835,7 @@@ F:   include/uapi/linux/nitro_enclaves.
  F:    samples/nitro_enclaves/
  
  NOHZ, DYNTICKS SUPPORT
 -M:    Frederic Weisbecker <f[email protected]>
 +M:    Frederic Weisbecker <f[email protected]>
  M:    Thomas Gleixner <[email protected]>
  M:    Ingo Molnar <[email protected]>
  L:    [email protected]
@@@ -15050,13 -14959,6 +15050,13 @@@ F: Documentation/devicetree/bindings/cl
  F:    drivers/clk/imx/
  F:    include/dt-bindings/clock/imx*
  
 +NXP i.MX 8M ISI DRIVER
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
 +F:    drivers/media/platform/nxp/imx8-isi/
 +
  NXP i.MX 8MQ DCSS DRIVER
  M:    Laurentiu Palcu <[email protected]>
  R:    Lucas Stach <[email protected]>
@@@ -15185,8 -15087,8 +15185,8 @@@ OBJTOO
  M:    Josh Poimboeuf <[email protected]>
  M:    Peter Zijlstra <[email protected]>
  S:    Supported
 +F:    include/linux/objtool*.h
  F:    tools/objtool/
 -F:    include/linux/objtool.h
  
  OCELOT ETHERNET SWITCH DRIVER
  M:    Vladimir Oltean <[email protected]>
@@@ -15417,6 -15319,18 +15417,6 @@@ S:  Maintaine
  F:    Documentation/filesystems/omfs.rst
  F:    fs/omfs/
  
 -OMNIKEY CARDMAN 4000 DRIVER
 -M:    Harald Welte <[email protected]>
 -S:    Maintained
 -F:    drivers/char/pcmcia/cm4000_cs.c
 -F:    include/linux/cm4000_cs.h
 -F:    include/uapi/linux/cm4000_cs.h
 -
 -OMNIKEY CARDMAN 4040 DRIVER
 -M:    Harald Welte <[email protected]>
 -S:    Maintained
 -F:    drivers/char/pcmcia/cm4040_cs.*
 -
  OMNIVISION OG01A1B SENSOR DRIVER
  M:    Shawn Tu <[email protected]>
  L:    [email protected]
@@@ -15472,7 -15386,6 +15472,7 @@@ M:   Shunqian Zheng <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml
  F:    drivers/media/i2c/ov2685.c
  
  OMNIVISION OV2740 SENSOR DRIVER
@@@ -15564,7 -15477,7 +15564,7 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/ov7740.c
  
  OMNIVISION OV8856 SENSOR DRIVER
 -M:    Dongchun Zhu <dongchun.zhu@mediatek.com>
 +M:    Sakari Ailus <[email protected].com>
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -15634,12 -15547,6 +15634,12 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/hwmon/oxp-sensors.c
  
 +ONIE TLV NVMEM LAYOUT DRIVER
 +M:    Miquel Raynal <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/nvmem/layouts/onie,tlv-layout.yaml
 +F:    drivers/nvmem/layouts/onie-tlv.c
 +
  ONION OMEGA2+ BOARD
  M:    Harvey Hunt <[email protected]>
  L:    [email protected]
@@@ -15713,13 -15620,6 +15713,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/ptp/ptp_ocp.c
  
 +INTEL PTP DFL ToD DRIVER
 +M:    Tianfei Zhang <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/ptp/ptp_dfl_tod.c
 +
  OPENCORES I2C BUS DRIVER
  M:    Peter Korsgaard <[email protected]>
  M:    Andrew Lunn <[email protected]>
@@@ -15739,7 -15639,7 +15739,7 @@@ S:   Maintaine
  W:    http://openrisc.io
  T:    git https://github.com/openrisc/linux.git
  F:    Documentation/devicetree/bindings/openrisc/
 -F:    Documentation/openrisc/
 +F:    Documentation/arch/openrisc/
  F:    arch/openrisc/
  F:    drivers/irqchip/irq-ompic.c
  F:    drivers/irqchip/irq-or1k-*
@@@ -15935,7 -15835,7 +15935,7 @@@ W:   https://parisc.wiki.kernel.or
  Q:    http://patchwork.kernel.org/project/linux-parisc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
 -F:    Documentation/parisc/
 +F:    Documentation/arch/parisc/
  F:    arch/parisc/
  F:    drivers/char/agp/parisc-agp.c
  F:    drivers/input/misc/hp_sdc_rtc.c
@@@ -16070,8 -15970,6 +16070,8 @@@ M:   Lucas Stach <[email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-common.yaml
 +F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml
  F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml
  F:    drivers/pci/controller/dwc/*imx6*
  
@@@ -16430,6 -16328,12 +16430,6 @@@ S:  Maintaine
  F:    crypto/pcrypt.c
  F:    include/crypto/pcrypt.h
  
 -PEAQ WMI HOTKEYS DRIVER
 -M:    Hans de Goede <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/platform/x86/peaq-wmi.c
 -
  PECI HARDWARE MONITORING DRIVERS
  M:    Iwona Winiarska <[email protected]>
  L:    [email protected]
@@@ -16866,8 -16770,9 +16866,8 @@@ F:   include/uapi/linux/if_pppol2tp.
  F:    net/l2tp/l2tp_ppp.c
  
  PPP PROTOCOL DRIVERS AND COMPRESSORS
 -M:    Paul Mackerras <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/net/ppp/ppp_*
  
  PPS SUPPORT
@@@ -17111,7 -17016,7 +17111,7 @@@ QAT DRIVE
  M:    Giovanni Cabiddu <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/crypto/qat/
 +F:    drivers/crypto/intel/qat/
  
  QCOM AUDIO (ASoC) DRIVERS
  M:    Srinivas Kandagatla <[email protected]>
@@@ -17261,12 -17166,6 +17261,12 @@@ F: fs/qnx4
  F:    include/uapi/linux/qnx4_fs.h
  F:    include/uapi/linux/qnxtypes.h
  
 +QNX6 FILESYSTEM
 +S:    Orphan
 +F:    Documentation/filesystems/qnx6.rst
 +F:    fs/qnx6/
 +F:    include/linux/qnx6_fs.h
 +
  QORIQ DPAA2 FSL-MC BUS DRIVER
  M:    Stuart Yoder <[email protected]>
  M:    Laurentiu Tudor <[email protected]>
@@@ -17295,7 -17194,7 +17295,7 @@@ S:   Supporte
  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:    drivers/net/wireless/ath/ath10k/
 -F:    Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt
 +F:    Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml
  
  QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
  M:    Kalle Valo <[email protected]>
@@@ -17331,7 -17230,6 +17331,7 @@@ F:   drivers/net/wwan/qcom_bam_dmux.
  QUALCOMM CAMERA SUBSYSTEM DRIVER
  M:    Robert Foss <[email protected]>
  M:    Todor Tomov <[email protected]>
 +M:    Bryan O'Donoghue <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/admin-guide/media/qcom_camss.rst
@@@ -17347,16 -17245,6 +17347,16 @@@ F: Documentation/devicetree/bindings/cl
  F:    drivers/clk/qcom/
  F:    include/dt-bindings/clock/qcom,*
  
 +QUALCOMM CLOUD AI (QAIC) DRIVER
 +M:    Jeffrey Hugo <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/accel/qaic/
 +F:    drivers/accel/qaic/
 +F:    include/uapi/drm/qaic_accel.h
 +
  QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
  M:    Bjorn Andersson <[email protected]>
  M:    Konrad Dybcio <[email protected]>
@@@ -17379,7 -17267,6 +17379,7 @@@ M:   Thara Gopinath <thara.gopinath@gmail
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/crypto/qcom-qce.yaml
  F:    drivers/crypto/qce/
  
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
@@@ -17393,7 -17280,7 +17393,7 @@@ M:   Vinod Koul <[email protected]
  R:    Bhupesh Sharma <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/net/qcom,ethqos.txt
 +F:    Documentation/devicetree/bindings/net/qcom,ethqos.yaml
  F:    drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
  
  QUALCOMM FASTRPC DRIVER
@@@ -17574,8 -17461,9 +17574,8 @@@ F:   drivers/block/rbd.
  F:    drivers/block/rbd_types.h
  
  RAGE128 FRAMEBUFFER DISPLAY DRIVER
 -M:    Paul Mackerras <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/video/fbdev/aty/aty128fb.c
  
  RAINSHADOW-CEC DRIVER
@@@ -17652,7 -17540,7 +17652,7 @@@ F:   include/ras/ras_event.
  RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
  L:    [email protected]
  S:    Orphan
 -F:    drivers/net/wireless/ray*
 +F:    drivers/net/wireless/legacy/ray*
  
  RC-CORE / LIRC FRAMEWORK
  M:    Sean Young <[email protected]>
@@@ -17738,7 -17626,7 +17738,7 @@@ M:   Fenghua Yu <[email protected]
  M:    Reinette Chatre <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/x86/resctrl*
 +F:    Documentation/arch/x86/resctrl*
  F:    arch/x86/include/asm/resctrl.h
  F:    arch/x86/kernel/cpu/resctrl/
  F:    tools/testing/selftests/resctrl/
@@@ -17747,13 -17635,11 +17747,13 @@@ READ-COPY UPDATE (RCU
  M:    "Paul E. McKenney" <[email protected]>
  M:    Frederic Weisbecker <[email protected]> (kernel/rcu/tree_nocb.h)
  M:    Neeraj Upadhyay <[email protected]> (kernel/rcu/tasks.h)
 +M:    Joel Fernandes <[email protected]>
  M:    Josh Triplett <[email protected]>
 +M:    Boqun Feng <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Mathieu Desnoyers <[email protected]>
  R:    Lai Jiangshan <[email protected]>
 -R:    Joel Fernandes <[email protected]>
 +R:    Zqiang <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.rdrop.com/users/paulmck/RCU/
@@@ -18203,12 -18089,6 +18203,12 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/iio/light/bh1750.yaml
  F:    drivers/iio/light/bh1750.c
  
 +ROHM BU27034 AMBIENT LIGHT SENSOR DRIVER
 +M:    Matti Vaittinen <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/iio/light/rohm-bu27034.c
 +
  ROHM MULTIFUNCTION BD9571MWV-M PMIC DEVICE DRIVERS
  M:    Marek Vasut <[email protected]>
  L:    [email protected]
@@@ -18614,7 -18494,6 +18614,7 @@@ M:   Sylwester Nawrocki <s.nawrocki@samsu
  M:    Andrzej Hajda <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/devicetree/bindings/media/samsung,s5c73m3.yaml
  F:    drivers/media/i2c/s5c73m3/*
  
  SAMSUNG S5K5BAF CAMERA DRIVER
@@@ -18639,11 -18518,6 +18639,11 @@@ M: Sylwester Nawrocki <s.nawrocki@samsu
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.linuxtv.org/project/linux-media/list/
 +F:    Documentation/devicetree/bindings/media/samsung,exynos4210-csis.yaml
 +F:    Documentation/devicetree/bindings/media/samsung,exynos4210-fimc.yaml
 +F:    Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-is.yaml
 +F:    Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-lite.yaml
 +F:    Documentation/devicetree/bindings/media/samsung,fimc.yaml
  F:    drivers/media/platform/samsung/exynos4-is/
  
  SAMSUNG SOC CLOCK DRIVERS
@@@ -18666,7 -18540,7 +18666,7 @@@ F:   include/linux/clk/samsung.
  
  SAMSUNG SPI DRIVERS
  M:    Krzysztof Kozlowski <[email protected]>
 -M:    Andi Shyti <andi@etezian.org>
 +M:    Andi Shyti <andi.shyti@kernel.org>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -18733,6 -18607,11 +18733,6 @@@ F:  include/linux/wait.
  F:    include/uapi/linux/sched.h
  F:    kernel/sched/
  
 -SCR24X CHIP CARD INTERFACE DRIVER
 -M:    Lubomir Rintel <[email protected]>
 -S:    Supported
 -F:    drivers/char/pcmcia/scr24x_cs.c
 -
  SCSI RDMA PROTOCOL (SRP) INITIATOR
  M:    Bart Van Assche <[email protected]>
  L:    [email protected]
@@@ -18942,8 -18821,8 +18942,8 @@@ S:   Supporte
  W:    https://selinuxproject.org
  W:    https://github.com/SELinuxProject
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
 -F:    Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
 -F:    Documentation/ABI/obsolete/sysfs-selinux-disable
 +F:    Documentation/ABI/removed/sysfs-selinux-checkreqprot
 +F:    Documentation/ABI/removed/sysfs-selinux-disable
  F:    Documentation/admin-guide/LSM/SELinux.rst
  F:    include/trace/events/avc.h
  F:    include/uapi/linux/selinux_netlink.h
@@@ -19029,14 -18908,6 +19029,14 @@@ S: Supporte
  F:    Documentation/networking/devlink/sfc.rst
  F:    drivers/net/ethernet/sfc/
  
 +SFCTEMP HWMON DRIVER
 +M:    Emil Renner Berthing <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/starfive,jh71x0-temp.yaml
 +F:    Documentation/hwmon/sfctemp.rst
 +F:    drivers/hwmon/sfctemp.c
 +
  SFF/SFP/SFP+ MODULE SUPPORT
  M:    Russell King <[email protected]>
  L:    [email protected]
@@@ -19125,7 -18996,6 +19125,7 @@@ L:   [email protected]
  S:    Odd Fixes
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/silabs,si470x.yaml
  F:    drivers/media/radio/si470x/radio-si470x-i2c.c
  
  SI470X FM RADIO RECEIVER USB DRIVER
@@@ -19201,7 -19071,6 +19201,7 @@@ M:   Conor Dooley <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
 +F:    Documentation/devicetree/bindings/cache/sifive,ccache0.yaml
  F:    drivers/soc/sifive/
  
  SILEAD TOUCHSCREEN DRIVER
@@@ -19311,12 -19180,6 +19311,12 @@@ F: drivers/irqchip/irq-sl28cpld.
  F:    drivers/pwm/pwm-sl28cpld.c
  F:    drivers/watchdog/sl28cpld_wdt.c
  
 +SL28 VPD NVMEM LAYOUT DRIVER
 +M:    Michael Walle <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/nvmem/layouts/kontron,sl28-vpd.yaml
 +F:    drivers/nvmem/layouts/sl28vpd.c
 +
  SLAB ALLOCATOR
  M:    Christoph Lameter <[email protected]>
  M:    Pekka Enberg <[email protected]>
@@@ -20039,13 -19902,6 +20039,13 @@@ M: Emil Renner Berthing <[email protected]
  S:    Maintained
  F:    arch/riscv/boot/dts/starfive/
  
 +STARFIVE DWMAC GLUE LAYER
 +M:    Emil Renner Berthing <[email protected]>
 +M:    Samin Guo <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
 +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
 +
  STARFIVE JH7100 CLOCK DRIVERS
  M:    Emil Renner Berthing <[email protected]>
  S:    Maintained
@@@ -20256,7 -20112,7 +20256,7 @@@ M:   John Paul Adrian Glaubitz <glaubitz@
  L:    [email protected]
  S:    Maintained
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
 -F:    Documentation/sh/
 +F:    Documentation/arch/sh/
  F:    arch/sh/
  F:    drivers/sh/
  
@@@ -20316,7 -20172,7 +20316,7 @@@ M:   Vineet Gupta <[email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git
 -F:    Documentation/arc/
 +F:    Documentation/arch/arc
  F:    Documentation/devicetree/bindings/arc/*
  F:    Documentation/devicetree/bindings/interrupt-controller/snps,arc*
  F:    arch/arc/
@@@ -20915,7 -20771,7 +20915,7 @@@ L:   [email protected]
  S:    Maintained
  F:    Documentation/driver-api/thermal/power_allocator.rst
  F:    drivers/thermal/gov_power_allocator.c
 -F:    include/trace/events/thermal_power_allocator.h
 +F:    drivers/thermal/thermal_trace_ipa.h
  
  THINKPAD ACPI EXTRAS DRIVER
  M:    Henrique de Moraes Holschuh <[email protected]>
@@@ -21212,6 -21068,7 +21212,6 @@@ F:   Documentation/hwmon/tmp401.rs
  F:    drivers/hwmon/tmp401.c
  
  TMP464 HARDWARE MONITOR DRIVER
 -M:    Agathe Porte <[email protected]>
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -21374,14 -21231,6 +21374,14 @@@ S: Maintaine
  F:    Documentation/tools/rtla/
  F:    tools/tracing/rtla/
  
 +TECHNICAL ADVISORY BOARD PROCESS DOCS
 +M:    "Theodore Ts'o" <[email protected]>
 +M:    Greg Kroah-Hartman <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/process/researcher-guidelines.rst
 +F:    Documentation/process/contribution-maturity-model.rst
 +
  TRADITIONAL CHINESE DOCUMENTATION
  M:    Hu Haowen <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -21516,10 -21365,8 +21516,8 @@@ F:  include/uapi/linux/ublk_cmd.
  UCLINUX (M68KNOMMU AND COLDFIRE)
  M:    Greg Ungerer <[email protected]>
  L:    [email protected]
- L:    [email protected]  (subscribers-only)
  S:    Maintained
  W:    http://www.linux-m68k.org/
- W:    http://www.uclinux.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git
  F:    arch/m68k/*/*_no.*
  F:    arch/m68k/68*/
@@@ -21936,7 -21783,7 +21934,7 @@@ USB WIRELESS RNDIS DRIVER (rndis_wlan
  M:    Jussi Kivilinna <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/wireless/rndis_wlan.c
 +F:    drivers/net/wireless/legacy/rndis_wlan.c
  
  USB XHCI DRIVER
  M:    Mathias Nyman <[email protected]>
@@@ -22215,7 -22062,6 +22213,7 @@@ F:   include/uapi/linux/virtio_console.
  VIRTIO CORE AND NET DRIVERS
  M:    "Michael S. Tsirkin" <[email protected]>
  M:    Jason Wang <[email protected]>
 +R:    Xuan Zhuo <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-vdpa
@@@ -22229,7 -22075,6 +22227,7 @@@ F:   drivers/vdpa
  F:    drivers/virtio/
  F:    include/linux/vdpa.h
  F:    include/linux/virtio*.h
 +F:    include/linux/vringh.h
  F:    include/uapi/linux/virtio_*.h
  F:    tools/virtio/
  
@@@ -22317,9 -22162,7 +22315,9 @@@ L:   [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
 +F:    kernel/vhost_task.c
  F:    drivers/vhost/
 +F:    include/linux/sched/vhost_task.h
  F:    include/linux/vhost_iotlb.h
  F:    include/uapi/linux/vhost.h
  
@@@ -22575,7 -22418,7 +22573,7 @@@ S:   Orpha
  F:    drivers/mmc/host/vub300.c
  
  W1 DALLAS'S 1-WIRE BUS
 -M:    Evgeniy Polyakov <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/w1/
  F:    Documentation/w1/
@@@ -22694,7 -22537,7 +22692,7 @@@ F:   drivers/input/misc/wistron_btns.
  WL3501 WIRELESS PCMCIA CARD DRIVER
  L:    [email protected]
  S:    Odd fixes
 -F:    drivers/net/wireless/wl3501*
 +F:    drivers/net/wireless/legacy/wl3501*
  
  WOLFSON MICROELECTRONICS DRIVERS
  L:    [email protected]
@@@ -22793,7 -22636,7 +22791,7 @@@ L:   [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
  F:    Documentation/devicetree/bindings/x86/
 -F:    Documentation/x86/
 +F:    Documentation/arch/x86/
  F:    arch/x86/
  
  X86 ENTRY CODE
@@@ -22803,24 -22646,13 +22801,24 @@@ S:        Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/asm
  F:    arch/x86/entry/
  
 +X86 HARDWARE VULNERABILITIES
 +M:    Thomas Gleixner <[email protected]>
 +M:    Borislav Petkov <[email protected]>
 +M:    Peter Zijlstra <[email protected]>
 +M:    Josh Poimboeuf <[email protected]>
 +R:    Pawan Gupta <[email protected]>
 +S:    Maintained
 +F:    Documentation/admin-guide/hw-vuln/
 +F:    arch/x86/include/asm/nospec-branch.h
 +F:    arch/x86/kernel/cpu/bugs.c
 +
  X86 MCE INFRASTRUCTURE
  M:    Tony Luck <[email protected]>
  M:    Borislav Petkov <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-mce
 -F:    Documentation/x86/x86_64/machinecheck.rst
 +F:    Documentation/arch/x86/x86_64/machinecheck.rst
  F:    arch/x86/kernel/cpu/mce/*
  
  X86 MICROCODE UPDATE SUPPORT
@@@ -22842,7 -22674,7 +22840,7 @@@ M:   Hans de Goede <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
 -F:    drivers/platform/x86/x86-android-tablets.c
 +F:    drivers/platform/x86/x86-android-tablets/
  
  X86 PLATFORM DRIVERS
  M:    Hans de Goede <[email protected]>
@@@ -23191,6 -23023,7 +23189,6 @@@ F:   drivers/i2c/busses/i2c-xlp9xx.
  
  XRA1403 GPIO EXPANDER
  M:    Nandor Han <[email protected]>
 -M:    Semi Malinen <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/gpio/gpio-xra1403.txt
@@@ -23348,13 -23181,6 +23346,13 @@@ L: [email protected]
  S:    Maintained
  F:    mm/zswap.c
  
 +NXP BLUETOOTH WIRELESS DRIVERS
 +M:    Amitkumar Karwar <[email protected]>
 +M:    Neeraj Kale <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml
 +F:    drivers/bluetooth/btnxpuart.c
 +
  THE REST
  M:    Linus Torvalds <[email protected]>
  L:    [email protected]

diff --combined arch/m68k/Kconfig.machine
index 28eebabfd34bc33bc16d9fe26432451ac1830f8a,255d50574065fc87c02593ab85a97552ad359ff8..1f3574aef638551dcfc35ac72edec4463dca849b
--- 1/arch/m68k/Kconfig.machine
--- 2/arch/m68k/Kconfig.machine
+++ b/arch/m68k/Kconfig.machine
@@@ -11,7 -11,7 +11,7 @@@ config AMIG
        help
          This option enables support for the Amiga series of computers. If
          you plan to use this kernel on an Amiga, say Y here and browse the
 -        material available in <file:Documentation/m68k>; otherwise say N.
 +        material available in <file:Documentation/arch/m68k>; otherwise say N.
  
  config ATARI
        bool "Atari support"
@@@ -23,7 -23,7 +23,7 @@@
          This option enables support for the 68000-based Atari series of
          computers (including the TT, Falcon and Medusa). If you plan to use
          this kernel on an Atari, say Y here and browse the material
 -        available in <file:Documentation/m68k>; otherwise say N.
 +        available in <file:Documentation/arch/m68k>; otherwise say N.
  
  config ATARI_KBD_CORE
        bool
@@@ -439,15 -439,6 +439,6 @@@ config RO
          that can be stored in flash, with possibly the text, and data
          regions being copied out to RAM at startup.
  
- config ROMBASE
-       hex "Address of the base of ROM device"
-       default "0"
-       depends on ROM
-       help
-         Define the address that the ROM region starts at. Some platforms
-         use this to set their chip select region accordingly for the boot
-         device.
- 
  config ROMVEC
        hex "Address of the base of the ROM vectors"
        default "0"
@@@ -465,14 -456,6 +456,6 @@@ config ROMSTAR
          Define the start address of the system image in ROM. Commonly this
          is strait after the ROM vectors.
  
- config ROMSIZE
-       hex "Size of the ROM device"
-       default "0x100000"
-       depends on ROM
-       help
-         Size of the ROM device. On some platforms this is used to setup
-         the chip select that controls the boot ROM device.
- 
  choice
        prompt "Kernel executes from"
        help