Merge tag 'linux-watchdog-6.4-rc1' of git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 May 2023 01:33:56 +0000 (18:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 May 2023 01:33:56 +0000 (18:33 -0700)
Pull watchdog updates from Wim Van Sebroeck:

 - Add watchdog driver for StarFive JH7100 and JH7110 Soc

 - Add Rockchip RK3588 devices

 - Add Qualcom IPQ5332 APSS, QCM2290 KPSS and SM6115 SoC devices

 - Add Mediatke MT8365 and MT6735 devices

 - Watchdog-core: Always set WDOG_HW_RUNNING when starting watchdog

 - Convert watchdog platform drivers to return void on the remove
   callback

 - Convert to devm_clk_get_enabled() helpers

 - ... and other small fixes and improvements

* tag 'linux-watchdog-6.4-rc1' of git://www.linux-watchdog.org/linux-watchdog: (72 commits)
  watchdog: dw_wdt: Simplify clk management
  watchdog: dw_wdt: Fix the error handling path of dw_wdt_drv_probe()
  watchdog: starfive: Fix the warning of starfive_wdt_match
  watchdog: starfive: Fix the probe return error if PM and early_enable are both disabled
  MAINTAINERS: Add fragment for Xilinx watchdog driver
  watchdog: menz069_wdt: fix timeout setting
  watchdog: menz069_wdt: fix watchdog initialisation
  dt-bindings: watchdog: alphascale-asm9260: convert to DT schema
  watchdog: loongson1_wdt: Implement restart handler
  dt-bindings: watchdog: Document Qualcomm SM6115 watchdog
  dt-bindings: watchdog: realtek,otto-wdt: simplify requiring interrupt-names
  dt-bindings: watchdog: toshiba,visconti-wdt: simplify with unevaluatedProperties
  dt-bindings: watchdog: fsl-imx7ulp-wdt: simplify with unevaluatedProperties
  dt-bindings: watchdog: arm,sp805: drop unneeded minItems
  dt-bindings: watchdog: drop duplicated GPIO watchdog bindings
  dt-bindings: reset: Add binding for MediaTek MT6735 TOPRGU/WDT
  drivers: watchdog: Add StarFive Watchdog driver
  dt-bindings: watchdog: Add watchdog for StarFive JH7100 and JH7110
  dt-bindings: watchdog: indentation, quotes and white-space cleanup
  watchdog: ebc-c384_wdt: Mark status as orphaned
  ...

1  2 
Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml
Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml
Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml
Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.yaml
Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml
Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml
Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.yaml
MAINTAINERS
drivers/watchdog/watchdog_dev.c

index fa05d62529829622b5cb1dafdf9e9eb95483eb1e,bbfa2bac6c3661c9ab5375b9d3fb930aff3f807e..b5573852ef5aa1a32d7a0ae79a56df7aa703840f
@@@ -7,7 -7,7 +7,7 @@@ $schema: http://devicetree.org/meta-sch
  title: ARM Secure Monitor Call based watchdog
  
  allOf:
 -  - $ref: "watchdog.yaml#"
 +  - $ref: watchdog.yaml#
  
  maintainers:
    - Julius Werner <jwerner@chromium.org>
@@@ -16,6 -16,7 +16,7 @@@ properties
    compatible:
      enum:
        - arm,smc-wdt
    arm,smc-id:
      $ref: /schemas/types.yaml#/definitions/uint32
      description: |
@@@ -30,9 -31,9 +31,9 @@@ unevaluatedProperties: fals
  examples:
    - |
      watchdog {
-       compatible = "arm,smc-wdt";
-       arm,smc-id = <0x82003D06>;
-       timeout-sec = <15>;
+         compatible = "arm,smc-wdt";
+         arm,smc-id = <0x82003D06>;
+         timeout-sec = <15>;
      };
  
  ...
index b28f7b57c36b060e637863b0ba55fc494e83dbe4,59e36d8ae45d14f012c79035f18ae571ab501ad3..816f85ee2c772220fb1f0ed36ea7c2f771a3f4df
@@@ -10,7 -10,7 +10,7 @@@ maintainers
    - Eugen Hristev <eugen.hristev@microchip.com>
  
  allOf:
 -  - $ref: "watchdog.yaml#"
 +  - $ref: watchdog.yaml#
  
  properties:
    compatible:
@@@ -65,13 -65,13 +65,13 @@@ examples
      #include <dt-bindings/interrupt-controller/irq.h>
  
      watchdog@fc068640 {
-       compatible = "atmel,sama5d4-wdt";
-       reg = <0xfc068640 0x10>;
-       interrupts = <4 IRQ_TYPE_LEVEL_HIGH 5>;
-       timeout-sec = <10>;
-       atmel,watchdog-type = "hardware";
-       atmel,dbg-halt;
-       atmel,idle-halt;
+         compatible = "atmel,sama5d4-wdt";
+         reg = <0xfc068640 0x10>;
+         interrupts = <4 IRQ_TYPE_LEVEL_HIGH 5>;
+         timeout-sec = <10>;
+         atmel,watchdog-type = "hardware";
+         atmel,dbg-halt;
+         atmel,idle-halt;
      };
  
  ...
index 428004e7f0c390c5a333e0b4466759e80c9e5fdc,94ae6565ed10e535c025c20e5e8510c469e0efa5..526ff908d134df1ef42a34d1caf3c3ff83be7dd0
@@@ -7,7 -7,7 +7,7 @@@ $schema: http://devicetree.org/meta-sch
  title: BCM63xx and BCM7038 watchdog timer
  
  allOf:
 -  - $ref: "watchdog.yaml#"
 +  - $ref: watchdog.yaml#
  
  maintainers:
    - Florian Fainelli <f.fainelli@gmail.com>
@@@ -37,7 -37,7 +37,7 @@@ required
  examples:
    - |
      watchdog@f040a7e8 {
-       compatible = "brcm,bcm7038-wdt";
-       reg = <0xf040a7e8 0x16>;
-       clocks = <&upg_fixed>;
+         compatible = "brcm,bcm7038-wdt";
+         reg = <0xf040a7e8 0x16>;
+         clocks = <&upg_fixed>;
      };
index 6e135f48b3ba1156b772b4a051b5794a3da00aa2,f1433d9b6cd996f0a005cd4b47cfdcf9ec437575..726dc872ad02dd8a0f9b44992edfbc3887806f87
@@@ -15,7 -15,7 +15,7 @@@ description: 
    SoCs and others.
  
  allOf:
 -  - $ref: "watchdog.yaml#"
 +  - $ref: watchdog.yaml#
  
  properties:
    compatible:
@@@ -52,16 -52,16 +52,16 @@@ examples
    - |
      #include <dt-bindings/interrupt-controller/irq.h>
      watchdog@41000000 {
-       compatible = "faraday,ftwdt010";
-       reg = <0x41000000 0x1000>;
-       interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
-       timeout-sec = <5>;
+         compatible = "faraday,ftwdt010";
+         reg = <0x41000000 0x1000>;
+         interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
+         timeout-sec = <5>;
      };
    - |
      watchdog: watchdog@98500000 {
-       compatible = "moxa,moxart-watchdog", "faraday,ftwdt010";
-       reg = <0x98500000 0x10>;
-       clocks = <&clk_apb>;
-       clock-names = "PCLK";
+         compatible = "moxa,moxart-watchdog", "faraday,ftwdt010";
+         reg = <0x98500000 0x10>;
+         clocks = <&clk_apb>;
+         clock-names = "PCLK";
      };
  ...
index d3790f1a96a2998d138f593df96e642769f6bda9,f42cc0904d43427ab77add64463bc5b564e2e9f1..4b7ed135570155790ae181243fa9972946d07b4d
@@@ -10,7 -10,7 +10,7 @@@ maintainers
    - Anson Huang <Anson.Huang@nxp.com>
  
  allOf:
 -  - $ref: "watchdog.yaml#"
 +  - $ref: watchdog.yaml#
  
  properties:
    compatible:
    clocks:
      maxItems: 1
  
-   timeout-sec: true
  required:
    - compatible
    - interrupts
    - reg
    - clocks
  
additionalProperties: false
unevaluatedProperties: false
  
  examples:
    - |
index 50c5c48ee6fba691fb2af39097095cb1be9c2b41,4ba262c06ca05669a91f8061af241465993ad760..951a7d54135a684939ba940e112c1736bbfbbcf3
@@@ -115,7 -115,7 +115,7 @@@ required
    - clocks
  
  allOf:
 -  - $ref: "watchdog.yaml#"
 +  - $ref: watchdog.yaml#
  
    - if:
        not:
@@@ -177,11 -177,11 +177,11 @@@ examples
      #include <dt-bindings/power/r8a7795-sysc.h>
      #include <dt-bindings/interrupt-controller/arm-gic.h>
      wdt0: watchdog@e6020000 {
-             compatible = "renesas,r8a7795-wdt", "renesas,rcar-gen3-wdt";
-             reg = <0xe6020000 0x0c>;
-             interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
-             clocks = <&cpg CPG_MOD 402>;
-             power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
-             resets = <&cpg 402>;
-             timeout-sec = <60>;
+         compatible = "renesas,r8a7795-wdt", "renesas,rcar-gen3-wdt";
+         reg = <0xe6020000 0x0c>;
+         interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
+         clocks = <&cpg CPG_MOD 402>;
+         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+         resets = <&cpg 402>;
+         timeout-sec = <60>;
      };
index 39139586611b494d161172b4f53638ccdd9e7e02,1b13a96abba96bf2e2c2ae430d9c6f0d73f41d12..76eceeddd1507daa963decf4f4f0431ff3925079
@@@ -7,7 -7,7 +7,7 @@@ $schema: http://devicetree.org/meta-sch
  title: Synopsys Designware Watchdog Timer
  
  allOf:
 -  - $ref: "watchdog.yaml#"
 +  - $ref: watchdog.yaml#
  
  maintainers:
    - Jamie Iles <jamie@jamieiles.com>
@@@ -83,25 -83,25 +83,25 @@@ required
  examples:
    - |
      watchdog@ffd02000 {
-       compatible = "snps,dw-wdt";
-       reg = <0xffd02000 0x1000>;
-       interrupts = <0 171 4>;
-       clocks = <&per_base_clk>;
-       resets = <&wdt_rst>;
+         compatible = "snps,dw-wdt";
+         reg = <0xffd02000 0x1000>;
+         interrupts = <0 171 4>;
+         clocks = <&per_base_clk>;
+         resets = <&wdt_rst>;
      };
  
    - |
      watchdog@ffd02000 {
-       compatible = "snps,dw-wdt";
-       reg = <0xffd02000 0x1000>;
-       interrupts = <0 171 4>;
-       clocks = <&per_base_clk>;
-       clock-names = "tclk";
-       snps,watchdog-tops = <0x000000FF 0x000001FF 0x000003FF
-                             0x000007FF 0x0000FFFF 0x0001FFFF
-                             0x0003FFFF 0x0007FFFF 0x000FFFFF
-                             0x001FFFFF 0x003FFFFF 0x007FFFFF
-                             0x00FFFFFF 0x01FFFFFF 0x03FFFFFF
-                             0x07FFFFFF>;
+         compatible = "snps,dw-wdt";
+         reg = <0xffd02000 0x1000>;
+         interrupts = <0 171 4>;
+         clocks = <&per_base_clk>;
+         clock-names = "tclk";
+         snps,watchdog-tops = <0x000000FF 0x000001FF 0x000003FF
+                               0x000007FF 0x0000FFFF 0x0001FFFF
+                               0x0003FFFF 0x0007FFFF 0x000FFFFF
+                               0x001FFFFF 0x003FFFFF 0x007FFFFF
+                               0x00FFFFFF 0x01FFFFFF 0x03FFFFFF
+                               0x07FFFFFF>;
      };
  ...
index 2cb1a2ed0f7b7a1d0fa4b33e0347d3468c968dee,144a0ce43952e020b1bbb5f5422784440ac63793..6b13bfc11e114d39770d1dd29c2d41ebed8a8de6
@@@ -11,7 -11,7 +11,7 @@@ maintainers
    - Christophe Roullier <christophe.roullier@foss.st.com>
  
  allOf:
 -  - $ref: "watchdog.yaml#"
 +  - $ref: watchdog.yaml#
  
  properties:
    compatible:
@@@ -48,11 -48,11 +48,11 @@@ examples
    - |
      #include <dt-bindings/clock/stm32mp1-clks.h>
      watchdog@5a002000 {
-       compatible = "st,stm32mp1-iwdg";
-       reg = <0x5a002000 0x400>;
-       clocks = <&rcc IWDG2>, <&rcc CK_LSI>;
-       clock-names = "pclk", "lsi";
-       timeout-sec = <32>;
+         compatible = "st,stm32mp1-iwdg";
+         reg = <0x5a002000 0x400>;
+         clocks = <&rcc IWDG2>, <&rcc CK_LSI>;
+         clock-names = "pclk", "lsi";
+         timeout-sec = <32>;
      };
  
  ...
diff --combined MAINTAINERS
index 593b8b17ef7f402349f46c9a3b6f729dc6c59626,7daa9e4ba146ce86db9f46d2b3bb3ae6c171ae79..e5c3101161d1e00a73f7e56f2f3d5b12303818a0
@@@ -224,13 -224,13 +224,13 @@@ S:      Orphan / Obsolet
  F:    drivers/net/ethernet/8390/
  
  9P FILE SYSTEM
 -M:    Eric Van Hensbergen <ericvh@gmail.com>
 +M:    Eric Van Hensbergen <ericvh@kernel.org>
  M:    Latchesar Ionkov <lucho@ionkov.net>
  M:    Dominique Martinet <asmadeus@codewreck.org>
  R:    Christian Schoenebeck <linux_oss@crudebyte.com>
 -L:    v9fs-developer@lists.sourceforge.net
 +L:    v9fs@lists.linux.dev
  S:    Maintained
 -W:    http://swik.net/v9fs
 +W:    http://github.com/v9fs
  Q:    http://patchwork.kernel.org/project/v9fs-devel/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
  T:    git git://github.com/martinetd/linux.git
@@@ -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 <nipun.gupta@amd.com>
 +M:    Nikhil Agarwal <nikhil.agarwal@amd.com>
 +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 <thomas.lendacky@amd.com>
  M:    John Allen <john.allen@amd.com>
@@@ -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 <shannon.nelson@amd.com>
 +M:    Brett Creeley <brett.creeley@amd.com>
 +L:    netdev@vger.kernel.org
 +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 <sanju.mehta@amd.com>
  S:    Maintained
@@@ -1088,7 -1071,7 +1088,7 @@@ M:      Naveen Krishna Chatradhi <naveenkris
  R:    Carlos Bilbao <carlos.bilbao@amd.com>
  L:    platform-driver-x86@vger.kernel.org
  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 <hverkuil-cisco@xs4all.nl>
 -L:    linux-media@vger.kernel.org
 -S:    Maintained
 -F:    drivers/media/i2c/ad9389b*
 -
  ANALOG DEVICES INC ADA4250 DRIVER
  M:    Antoniu Miclaus <antoniu.miclaus@analog.com>
  L:    linux-iio@vger.kernel.org
@@@ -1439,6 -1428,11 +1439,6 @@@ S:     Supporte
  F:    drivers/clk/analogbits/*
  F:    include/linux/clk/analogbits*
  
 -ANDROID CONFIG FRAGMENTS
 -M:    Rob Herring <robh@kernel.org>
 -S:    Supported
 -F:    kernel/configs/android*
 -
  ANDROID DRIVERS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  M:    Arve Hjønnevåg <arve@android.com>
@@@ -1961,7 -1955,6 +1961,7 @@@ F:      Documentation/devicetree/bindings/nv
  F:    Documentation/devicetree/bindings/pci/apple,pcie.yaml
  F:    Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
  F:    Documentation/devicetree/bindings/power/apple*
 +F:    Documentation/devicetree/bindings/pwm/pwm-apple.yaml
  F:    Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
  F:    arch/arm64/boot/dts/apple/
  F:    drivers/bluetooth/hci_bcm4377.c
@@@ -1977,7 -1970,6 +1977,7 @@@ F:      drivers/mailbox/apple-mailbox.
  F:    drivers/nvme/host/apple.c
  F:    drivers/nvmem/apple-efuses.c
  F:    drivers/pinctrl/pinctrl-apple-gpio.c
 +F:    drivers/pwm/pwm-apple.c
  F:    drivers/soc/apple/*
  F:    drivers/watchdog/apple_wdt.c
  F:    include/dt-bindings/interrupt-controller/apple-aic.h
@@@ -2080,7 -2072,6 +2080,7 @@@ M:      Alexander Sverdlin <alexander.sverdl
  L:    linux-arm-kernel@lists.infradead.org (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
@@@ -2100,6 -2091,7 +2100,6 @@@ F:      arch/arm/boot/dts/cx92755
  N:    digicolor
  
  ARM/CORESIGHT FRAMEWORK AND DRIVERS
 -M:    Mathieu Poirier <mathieu.poirier@linaro.org>
  M:    Suzuki K Poulose <suzuki.poulose@arm.com>
  R:    Mike Leach <mike.leach@linaro.org>
  R:    Leo Yan <leo.yan@linaro.org>
@@@ -2283,7 -2275,7 +2283,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
  
@@@ -2612,12 -2604,6 +2612,12 @@@ F:    include/dt-bindings/*/qcom
  F:    include/linux/*/qcom*
  F:    include/linux/soc/qcom/
  
 +ARM/QUALCOMM CHROMEBOOK SUPPORT
 +R:    cros-qcom-dts-watchers@chromium.org
 +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 <manivannan.sadhasivam@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2668,7 -2654,6 +2668,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 <linux@armlinux.org.uk>
@@@ -2864,7 -2849,6 +2864,7 @@@ F:      Documentation/devicetree/bindings/re
  F:    arch/arm/boot/dts/sunplus-sp7021*.dts*
  F:    arch/arm/configs/sp7021_*defconfig
  F:    arch/arm/mach-sunplus/
 +F:    drivers/clk/clk-sp7021.c
  F:    drivers/irqchip/irq-sp7021-intc.c
  F:    drivers/reset/reset-sunplus.c
  F:    include/dt-bindings/clock/sunplus,sp7021-clkc.h
@@@ -3039,7 -3023,7 +3039,7 @@@ F:      drivers/video/fbdev/wm8505fb
  F:    drivers/video/fbdev/wmt_ge_rops.*
  
  ARM/ZYNQ ARCHITECTURE
 -M:    Michal Simek <michal.simek@xilinx.com>
 +M:    Michal Simek <michal.simek@amd.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  W:    http://wiki.xilinx.com
@@@ -4447,13 -4431,6 +4447,13 @@@ S:    Maintaine
  F:    drivers/scsi/BusLogic.*
  F:    drivers/scsi/FlashPoint.*
  
 +BXCAN CAN NETWORK DRIVER
 +M:    Dario Binacchi <dario.binacchi@amarulasolutions.com>
 +L:    linux-can@vger.kernel.org
 +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 <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -4484,14 -4461,14 +4484,14 @@@ F:   Documentation/devicetree/bindings/ne
  F:    drivers/net/ieee802154/ca8210.c
  
  CANAAN/KENDRYTE K210 SOC FPIOA DRIVER
 -M:    Damien Le Moal <damien.lemoal@wdc.com>
 +M:    Damien Le Moal <dlemoal@kernel.org>
  L:    linux-riscv@lists.infradead.org
  L:    linux-gpio@vger.kernel.org (pinctrl driver)
  F:    Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml
  F:    drivers/pinctrl/pinctrl-k210.c
  
  CANAAN/KENDRYTE K210 SOC RESET CONTROLLER DRIVER
 -M:    Damien Le Moal <damien.lemoal@wdc.com>
 +M:    Damien Le Moal <dlemoal@kernel.org>
  L:    linux-kernel@vger.kernel.org
  L:    linux-riscv@lists.infradead.org
  S:    Maintained
@@@ -4499,7 -4476,7 +4499,7 @@@ F:      Documentation/devicetree/bindings/re
  F:    drivers/reset/reset-k210.c
  
  CANAAN/KENDRYTE K210 SOC SYSTEM CONTROLLER DRIVER
 -M:    Damien Le Moal <damien.lemoal@wdc.com>
 +M:    Damien Le Moal <dlemoal@kernel.org>
  L:    linux-riscv@lists.infradead.org
  S:    Maintained
  F:      Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml
@@@ -4928,7 -4905,6 +4928,7 @@@ L:      patches@opensource.cirrus.co
  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*
@@@ -5964,6 -5940,11 +5964,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 <device@lanana.org>
 -S:    Maintained
 -W:    http://lanana.org/docs/device-list/index.html
 -
  DEVICE RESOURCE MANAGEMENT HELPERS
  M:    Hans de Goede <hdegoede@redhat.com>
  R:    Matti Vaittinen <mazziesaccount@gmail.com>
@@@ -6226,7 -6207,6 +6226,7 @@@ DOCUMENTATION REPORTING ISSUE
  M:    Thorsten Leemhuis <linux@leemhuis.info>
  L:    linux-doc@vger.kernel.org
  S:    Maintained
 +F:    Documentation/admin-guide/quickly-build-trimmed-linux.rst
  F:    Documentation/admin-guide/reporting-issues.rst
  
  DOCUMENTATION SCRIPTS
@@@ -6338,9 -6318,7 +6338,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)
@@@ -6540,7 -6518,6 +6540,7 @@@ L:      linux-arm-msm@vger.kernel.or
  L:    dri-devel@lists.freedesktop.org
  L:    freedreno@lists.freedesktop.org
  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/
@@@ -6560,13 -6537,6 +6560,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 <lujianhua000@gmail.com>
 +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 <sumit.semwal@linaro.org>
  S:    Maintained
@@@ -6647,16 -6617,6 +6647,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 <inki.dae@samsung.com>
 +M:    Jagan Teki <jagan@amarulasolutions.com>
 +M:    Marek Szyprowski <m.szyprowski@samsung.com>
 +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 <markuss.broks@gmail.com>
  S:    Maintained
@@@ -6864,7 -6824,6 +6864,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 <inki.dae@samsung.com>
@@@ -6957,7 -6916,6 +6957,7 @@@ F:      drivers/phy/mediatek/phy-mtk-mipi
  
  DRM DRIVERS FOR NVIDIA TEGRA
  M:    Thierry Reding <thierry.reding@gmail.com>
 +M:    Mikko Perttunen <mperttunen@nvidia.com>
  L:    dri-devel@lists.freedesktop.org
  L:    linux-tegra@vger.kernel.org
  S:    Supported
@@@ -7086,7 -7044,7 +7086,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/xlnx/
  
  DRM PANEL DRIVERS
 -M:    Thierry Reding <thierry.reding@gmail.com>
 +M:    Neil Armstrong <neil.armstrong@linaro.org>
  R:    Sam Ravnborg <sam@ravnborg.org>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
@@@ -7567,6 -7525,12 +7567,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 <olivia@selenic.com>
 -M:    David Woodhouse <dwmw2@infradead.org>
 -L:    linux-embedded@vger.kernel.org
 -S:    Maintained
 -
  EMMC CMDQ HOST CONTROLLER INTERFACE (CQHCI) DRIVER
  M:    Adrian Hunter <adrian.hunter@intel.com>
  M:    Ritesh Harjani <riteshh@codeaurora.org>
@@@ -7764,7 -7728,6 +7764,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 <zohar@linux.ibm.com>
@@@ -7991,11 -7954,10 +7991,11 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    drivers/target/sbp/
  
  FIREWIRE SUBSYSTEM
 -M:    Stefan Richter <stefanr@s5r6.in-berlin.de>
 +M:    Takashi Sakamoto <o-takashi@sakamocchi.jp>
 +M:    Takashi Sakamoto <takaswie@kernel.org>
  L:    linux1394-devel@lists.sourceforge.net
  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
@@@ -8138,7 -8100,7 +8138,7 @@@ M:      Pankaj Gupta <pankaj.gupta@nxp.com
  M:    Gaurav Jain <gaurav.jain@nxp.com>
  L:    linux-crypto@vger.kernel.org
  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
@@@ -8286,23 -8248,6 +8286,23 @@@ S:    Maintaine
  F:    drivers/soc/fsl/qe/
  F:    include/soc/fsl/qe/
  
 +FREESCALE QUICC ENGINE QMC DRIVER
 +M:    Herve Codina <herve.codina@bootlin.com>
 +L:    linuxppc-dev@lists.ozlabs.org
 +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 <herve.codina@bootlin.com>
 +L:    linuxppc-dev@lists.ozlabs.org
 +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 <leoyang.li@nxp.com>
  L:    netdev@vger.kernel.org
@@@ -8354,14 -8299,6 +8354,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 <herve.codina@bootlin.com>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +L:    linuxppc-dev@lists.ozlabs.org
 +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 <leoyang.li@nxp.com>
  L:    linux-usb@vger.kernel.org
@@@ -8481,6 -8418,14 +8481,6 @@@ L:     platform-driver-x86@vger.kernel.or
  S:    Maintained
  F:    drivers/platform/x86/fujitsu-laptop.c
  
 -FUJITSU M-5MO LS CAMERA ISP DRIVER
 -M:    Kyungmin Park <kyungmin.park@samsung.com>
 -M:    Heungjun Kim <riverful.kim@samsung.com>
 -L:    linux-media@vger.kernel.org
 -S:    Maintained
 -F:    drivers/media/i2c/m5mols/
 -F:    include/media/i2c/m5mols.h
 -
  FUJITSU TABLET EXTRAS
  M:    Robert Gerlach <khnz@gmx.de>
  L:    platform-driver-x86@vger.kernel.org
@@@ -8745,7 -8690,7 +8745,7 @@@ F:      drivers/input/touchscreen/goodix
  
  GOOGLE ETHERNET DRIVERS
  M:    Jeroen de Borst <jeroendb@google.com>
 -M:    Catherine Sullivan <csully@google.com>
 +M:    Praveen Kaligineedi <pkaligineedi@google.com>
  R:    Shailend Chand <shailend@google.com>
  L:    netdev@vger.kernel.org
  S:    Supported
@@@ -8808,6 -8753,7 +8808,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/
@@@ -8994,17 -8940,6 +8994,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 <chuck.lever@oracle.com>
 +L:    kernel-tls-handshake@lists.linux.dev
 +L:    netdev@vger.kernel.org
 +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 <ezequiel@vanguardiasur.com.ar>
  M:    Philipp Zabel <p.zabel@pengutronix.de>
@@@ -9491,9 -9426,6 +9491,9 @@@ F:      drivers/input/touchscreen/htcpen.
  
  HTE SUBSYSTEM
  M:    Dipen Patel <dipenp@nvidia.com>
 +L:    timestamp@lists.linux.dev
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git
 +Q:    https://patchwork.kernel.org/project/timestamp/list/
  S:    Maintained
  F:    Documentation/devicetree/bindings/timestamp/
  F:    Documentation/driver-api/hte/
@@@ -9588,7 -9520,6 +9588,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
@@@ -9783,12 -9714,6 +9783,12 @@@ S:    Orpha
  F:    Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.yaml
  F:    drivers/i3c/master/dw*
  
 +I3C DRIVER FOR ASPEED AST2600
 +M:    Jeremy Kerr <jk@codeconstruct.com.au>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/i3c/aspeed,ast2600-i3c.yaml
 +F:    drivers/i3c/master/ast2600-i3c-master.c
 +
  I3C SUBSYSTEM
  M:    Alexandre Belloni <alexandre.belloni@bootlin.com>
  L:    linux-i3c@lists.infradead.org (moderated for non-subscribers)
@@@ -9804,7 -9729,7 +9804,7 @@@ F:      include/linux/i3c
  IA64 (Itanium) PLATFORM
  L:    linux-ia64@vger.kernel.org
  S:    Orphan
 -F:    Documentation/ia64/
 +F:    Documentation/arch/ia64/
  F:    arch/ia64/
  
  IBM Operation Panel Input Driver
@@@ -9912,11 -9837,6 +9912,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 <tpearson@raptorengineering.com>
 +S:    Supported
 +F:    drivers/vfio/vfio_iommu_spapr_tce.c
 +
  IBM ServeRAID RAID DRIVER
  S:    Orphan
  F:    drivers/scsi/ips.*
@@@ -10019,13 -9939,6 +10019,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 <mazziesaccount@gmail.com>
 +L:    linux-iio@vger.kernel.org
 +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 <peda@axentia.se>
  L:    linux-iio@vger.kernel.org
@@@ -10370,14 -10283,12 +10370,14 @@@ M:        Andy Shevchenko <andy@kernel.org
  L:    linux-gpio@vger.kernel.org
  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 <zhenyuw@linux.intel.com>
@@@ -10470,7 -10381,7 +10470,7 @@@ INTEL IXP4XX CRYPTO SUPPOR
  M:    Corentin Labbe <clabbe@baylibre.com>
  L:    linux-crypto@vger.kernel.org
  S:    Maintained
 -F:    drivers/crypto/ixp4xx_crypto.c
 +F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  
  INTEL ISHTP ECLITE DRIVER
  M:    Sumesh K Naduvalath <sumesh.k.naduvalath@intel.com>
@@@ -10505,11 -10416,11 +10505,11 @@@ INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVE
  M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
  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 <daniele.alessandrelli@intel.com>
@@@ -10517,20 -10428,27 +10517,20 @@@ M:        Prabhjot Khurana <prabhjot.khurana@i
  M:    Mark Gross <mgross@linux.intel.com>
  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 <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 THUNDER BAY EMMC PHY DRIVER
 -M:    Nandhini Srikandan <nandhini.srikandan@intel.com>
 -M:    Rashmi A <rashmi.a@intel.com>
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/phy/intel,phy-thunderbay-emmc.yaml
 -F:    drivers/phy/intel/phy-intel-thunderbay-emmc.c
 +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 MANAGEMENT ENGINE (mei)
  M:    Tomas Winkler <tomas.winkler@intel.com>
@@@ -10542,7 -10460,6 +10542,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/*
  
@@@ -10731,7 -10648,7 +10731,7 @@@ L:   tboot-devel@lists.sourceforge.ne
  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
  
@@@ -10742,7 -10659,7 +10742,7 @@@ L:   linux-sgx@vger.kernel.or
  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
@@@ -11606,6 -11523,16 +11606,6 @@@ F:  include/linux/kmemleak.
  F:    mm/kmemleak.c
  F:    samples/kmemleak/kmemleak-test.c
  
 -KMOD KERNEL MODULE LOADER - USERMODE HELPER
 -M:    Luis Chamberlain <mcgrof@kernel.org>
 -L:    linux-kernel@vger.kernel.org
 -L:    linux-modules@vger.kernel.org
 -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 <glider@google.com>
  R:    Marco Elver <elver@google.com>
@@@ -11722,7 -11649,6 +11722,7 @@@ L:   linux-leds@vger.kernel.or
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git
  F:    Documentation/devicetree/bindings/leds/
 +F:    Documentation/leds/
  F:    drivers/leds/
  F:    include/dt-bindings/leds/
  F:    include/linux/leds.h
@@@ -11832,7 -11758,7 +11832,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    drivers/ata/sata_promise.*
  
  LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
 -M:    Damien Le Moal <damien.lemoal@opensource.wdc.com>
 +M:    Damien Le Moal <dlemoal@kernel.org>
  L:    linux-ide@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git
@@@ -11968,7 -11894,6 +11968,7 @@@ M:   Scott Wood <oss@buserror.net
  L:    linuxppc-dev@lists.ozlabs.org
  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/
@@@ -12192,19 -12117,11 +12192,19 @@@ S:        Maintaine
  F:    Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml
  F:    drivers/pinctrl/pinctrl-loongson2.c
  
 +LOONGSON GPIO DRIVER
 +M:    Yinbo Zhu <zhuyinbo@loongson.cn>
 +L:    linux-gpio@vger.kernel.org
 +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 <zhuyinbo@loongson.cn>
  L:    linux-clk@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/clock/loongson,ls2k-clk.yaml
 +F:    drivers/clk/clk-loongson2.c
  F:    include/dt-bindings/clock/loongson,ls2k-clk.h
  
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
@@@ -12359,7 -12276,7 +12359,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/
  
@@@ -13126,14 -13043,6 +13126,14 @@@ L: netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/mediatek/
  
 +MEDIATEK ETHERNET PCS DRIVER
 +M:    Alexander Couzens <lynxis@fe80.eu>
 +M:    Daniel Golle <daniel@makrotopia.org>
 +L:    netdev@vger.kernel.org
 +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 <qii.wang@mediatek.com>
  L:    linux-i2c@vger.kernel.org
@@@ -13258,11 -13167,8 +13258,11 @@@ MEDIATEK SWITCH DRIVE
  M:    Sean Wang <sean.wang@mediatek.com>
  M:    Landen Chao <Landen.Chao@mediatek.com>
  M:    DENG Qingfang <dqfext@gmail.com>
 +M:    Daniel Golle <daniel@makrotopia.org>
  L:    netdev@vger.kernel.org
  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
  
@@@ -13463,14 -13369,13 +13463,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 <rppt@kernel.org>
  L:    linux-mm@kvack.org
  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
@@@ -13505,7 -13410,6 +13505,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/
@@@ -13514,7 -13418,6 +13514,7 @@@ VMALLO
  M:    Andrew Morton <akpm@linux-foundation.org>
  R:    Uladzislau Rezki <urezki@gmail.com>
  R:    Christoph Hellwig <hch@infradead.org>
 +R:    Lorenzo Stoakes <lstoakes@gmail.com>
  L:    linux-mm@kvack.org
  S:    Maintained
  W:    http://www.linux-mm.org
@@@ -13691,13 -13594,9 +13691,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:    alsa-devel@alsa-project.org (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
@@@ -13870,10 -13769,9 +13870,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:    linux-arm-kernel@lists.infradead.org (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
  
@@@ -14103,6 -14001,7 +14103,6 @@@ L:   linux-mips@vger.kernel.or
  S:    Maintained
  F:    arch/mips/include/asm/mach-loongson32/
  F:    arch/mips/loongson32/
 -F:    drivers/*/*/*loongson1*
  F:    drivers/*/*loongson1*
  
  MIPS/LOONGSON2EF ARCHITECTURE
@@@ -14185,11 -14084,8 +14185,11 @@@ L: linux-kernel@vger.kernel.or
  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 <sravanhome@gmail.com>
@@@ -14243,13 -14139,6 +14243,13 @@@ S: Odd Fixe
  F:    Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
  F:    drivers/net/ieee802154/mrf24j40.c
  
 +MSI EC DRIVER
 +M:    Nikita Kravets <teackot@gmail.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +W:    https://github.com/BeardOverflow/msi-ec
 +F:    drivers/platform/x86/msi-ec.*
 +
  MSI LAPTOP SUPPORT
  M:    "Lee, Chun-Yi" <jlee@suse.com>
  L:    platform-driver-x86@vger.kernel.org
@@@ -14294,6 -14183,14 +14294,6 @@@ L:  linux-mtd@lists.infradead.or
  S:    Maintained
  F:    drivers/mtd/devices/docg3*
  
 -MT9M032 APTINA SENSOR DRIVER
 -M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 -L:    linux-media@vger.kernel.org
 -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 <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
@@@ -14303,6 -14200,14 +14303,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 <laurent.pinchart@ideasonboard.com>
 -L:    linux-media@vger.kernel.org
 -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 <jacopo@jmondi.org>
  L:    linux-media@vger.kernel.org
@@@ -14689,14 -14594,11 +14689,14 @@@ F:        net/netlabel
  
  NETWORKING [MPTCP]
  M:    Matthieu Baerts <matthieu.baerts@tessares.net>
 +M:    Mat Martineau <martineau@kernel.org>
  L:    netdev@vger.kernel.org
  L:    mptcp@lists.linux.dev
  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
@@@ -14759,6 -14661,7 +14759,6 @@@ L:   netdev@vger.kernel.or
  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/
@@@ -14841,7 -14744,7 +14841,7 @@@ F:   include/uapi/linux/nitro_enclaves.
  F:    samples/nitro_enclaves/
  
  NOHZ, DYNTICKS SUPPORT
 -M:    Frederic Weisbecker <fweisbec@gmail.com>
 +M:    Frederic Weisbecker <frederic@kernel.org>
  M:    Thomas Gleixner <tglx@linutronix.de>
  M:    Ingo Molnar <mingo@kernel.org>
  L:    linux-kernel@vger.kernel.org
@@@ -14876,12 -14779,6 +14876,12 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    tools/include/nolibc/
  F:    tools/testing/selftests/nolibc/
  
 +NOVATEK NVT-TS I2C TOUCHSCREEN DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    drivers/input/touchscreen/novatek-nvt-ts.c
 +
  NSDEPS
  M:    Matthias Maennich <maennich@google.com>
  S:    Maintained
@@@ -15062,13 -14959,6 +15062,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 <laurent.pinchart@ideasonboard.com>
 +L:    linux-media@vger.kernel.org
 +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 <laurentiu.palcu@oss.nxp.com>
  R:    Lucas Stach <l.stach@pengutronix.de>
@@@ -15197,8 -15087,8 +15197,8 @@@ OBJTOO
  M:    Josh Poimboeuf <jpoimboe@kernel.org>
  M:    Peter Zijlstra <peterz@infradead.org>
  S:    Supported
 +F:    include/linux/objtool*.h
  F:    tools/objtool/
 -F:    include/linux/objtool.h
  
  OCELOT ETHERNET SWITCH DRIVER
  M:    Vladimir Oltean <vladimir.oltean@nxp.com>
@@@ -15429,6 -15319,18 +15429,6 @@@ S:  Maintaine
  F:    Documentation/filesystems/omfs.rst
  F:    fs/omfs/
  
 -OMNIKEY CARDMAN 4000 DRIVER
 -M:    Harald Welte <laforge@gnumonks.org>
 -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 <laforge@gnumonks.org>
 -S:    Maintained
 -F:    drivers/char/pcmcia/cm4040_cs.*
 -
  OMNIVISION OG01A1B SENSOR DRIVER
  M:    Shawn Tu <shawnx.tu@intel.com>
  L:    linux-media@vger.kernel.org
@@@ -15484,7 -15386,6 +15484,7 @@@ M:   Shunqian Zheng <zhengsq@rock-chips.c
  L:    linux-media@vger.kernel.org
  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
@@@ -15576,7 -15477,7 +15576,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 <sakari.ailus@linux.intel.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -15646,12 -15547,6 +15646,12 @@@ L: linux-hwmon@vger.kernel.or
  S:    Maintained
  F:    drivers/hwmon/oxp-sensors.c
  
 +ONIE TLV NVMEM LAYOUT DRIVER
 +M:    Miquel Raynal <miquel.raynal@bootlin.com>
 +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 <harveyhuntnexus@gmail.com>
  L:    linux-mips@vger.kernel.org
@@@ -15725,13 -15620,6 +15725,13 @@@ L: netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/ptp/ptp_ocp.c
  
 +INTEL PTP DFL ToD DRIVER
 +M:    Tianfei Zhang <tianfei.zhang@intel.com>
 +L:    linux-fpga@vger.kernel.org
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/ptp/ptp_dfl_tod.c
 +
  OPENCORES I2C BUS DRIVER
  M:    Peter Korsgaard <peter@korsgaard.com>
  M:    Andrew Lunn <andrew@lunn.ch>
@@@ -15751,7 -15639,7 +15751,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-*
@@@ -15947,7 -15835,7 +15947,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
@@@ -16082,8 -15970,6 +16082,8 @@@ M:   Lucas Stach <l.stach@pengutronix.de
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (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*
  
@@@ -16442,6 -16328,12 +16442,6 @@@ S:  Maintaine
  F:    crypto/pcrypt.c
  F:    include/crypto/pcrypt.h
  
 -PEAQ WMI HOTKEYS DRIVER
 -M:    Hans de Goede <hdegoede@redhat.com>
 -L:    platform-driver-x86@vger.kernel.org
 -S:    Maintained
 -F:    drivers/platform/x86/peaq-wmi.c
 -
  PECI HARDWARE MONITORING DRIVERS
  M:    Iwona Winiarska <iwona.winiarska@intel.com>
  L:    linux-hwmon@vger.kernel.org
@@@ -16627,28 -16519,6 +16627,28 @@@ F: Documentation/devicetree/bindings/pi
  F:    Documentation/devicetree/bindings/pinctrl/mediatek,mt8183-pinctrl.yaml
  F:    drivers/pinctrl/mediatek/
  
 +PIN CONTROLLER - MEDIATEK MIPS
 +M:    Arınç ÜNAL <arinc.unal@arinc9.com>
 +M:    Sergio Paracuellos <sergio.paracuellos@gmail.com>
 +L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-mips@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pinctrl/mediatek,mt7620-pinctrl.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/mediatek,mt7621-pinctrl.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/mediatek,mt76x8-pinctrl.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/ralink,rt2880-pinctrl.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/ralink,rt305x-pinctrl.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/ralink,rt3352-pinctrl.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/ralink,rt3883-pinctrl.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/ralink,rt5350-pinctrl.yaml
 +F:    drivers/pinctrl/mediatek/pinctrl-mt7620.c
 +F:    drivers/pinctrl/mediatek/pinctrl-mt7621.c
 +F:    drivers/pinctrl/mediatek/pinctrl-mt76x8.c
 +F:    drivers/pinctrl/mediatek/pinctrl-mtmips.*
 +F:    drivers/pinctrl/mediatek/pinctrl-rt2880.c
 +F:    drivers/pinctrl/mediatek/pinctrl-rt305x.c
 +F:    drivers/pinctrl/mediatek/pinctrl-rt3883.c
 +
  PIN CONTROLLER - MICROCHIP AT91
  M:    Ludovic Desroches <ludovic.desroches@microchip.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -16657,14 -16527,6 +16657,14 @@@ S: Supporte
  F:    drivers/gpio/gpio-sama5d2-piobu.c
  F:    drivers/pinctrl/pinctrl-at91*
  
 +PIN CONTROLLER - NXP S32
 +M:    Chester Lin <clin@suse.com>
 +R:    NXP S32 Linux Team <s32@nxp.com>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pinctrl/nxp,s32*
 +F:    drivers/pinctrl/nxp/
 +
  PIN CONTROLLER - QUALCOMM
  M:    Bjorn Andersson <andersson@kernel.org>
  L:    linux-arm-msm@vger.kernel.org
@@@ -16704,6 -16566,11 +16704,6 @@@ L:  linux-omap@vger.kernel.or
  S:    Maintained
  F:    drivers/pinctrl/pinctrl-single.c
  
 -PIN CONTROLLER - THUNDERBAY
 -M:    Lakshmi Sowjanya D <lakshmi.sowjanya.d@intel.com>
 -S:    Supported
 -F:    drivers/pinctrl/pinctrl-thunderbay.c
 -
  PIN CONTROLLER - SUNPLUS / TIBBO
  M:    Dvorkin Dmitry <dvorkin@tibbo.com>
  M:    Wells Lu <wellslutw@gmail.com>
@@@ -16903,8 -16770,9 +16903,8 @@@ F:   include/uapi/linux/if_pppol2tp.
  F:    net/l2tp/l2tp_ppp.c
  
  PPP PROTOCOL DRIVERS AND COMPRESSORS
 -M:    Paul Mackerras <paulus@samba.org>
  L:    linux-ppp@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    drivers/net/ppp/ppp_*
  
  PPS SUPPORT
@@@ -17148,7 -17016,7 +17148,7 @@@ QAT DRIVE
  M:    Giovanni Cabiddu <giovanni.cabiddu@intel.com>
  L:    qat-linux@intel.com
  S:    Supported
 -F:    drivers/crypto/qat/
 +F:    drivers/crypto/intel/qat/
  
  QCOM AUDIO (ASoC) DRIVERS
  M:    Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
@@@ -17298,12 -17166,6 +17298,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 <stuyoder@gmail.com>
  M:    Laurentiu Tudor <laurentiu.tudor@nxp.com>
@@@ -17332,7 -17194,7 +17332,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 <kvalo@kernel.org>
@@@ -17368,7 -17230,6 +17368,7 @@@ F:   drivers/net/wwan/qcom_bam_dmux.
  QUALCOMM CAMERA SUBSYSTEM DRIVER
  M:    Robert Foss <rfoss@kernel.org>
  M:    Todor Tomov <todor.too@gmail.com>
 +M:    Bryan O'Donoghue <bryan.odonoghue@linaro.org>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    Documentation/admin-guide/media/qcom_camss.rst
@@@ -17384,16 -17245,6 +17384,16 @@@ F: Documentation/devicetree/bindings/cl
  F:    drivers/clk/qcom/
  F:    include/dt-bindings/clock/qcom,*
  
 +QUALCOMM CLOUD AI (QAIC) DRIVER
 +M:    Jeffrey Hugo <quic_jhugo@quicinc.com>
 +L:    linux-arm-msm@vger.kernel.org
 +L:    dri-devel@lists.freedesktop.org
 +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 <andersson@kernel.org>
  M:    Konrad Dybcio <konrad.dybcio@linaro.org>
@@@ -17416,7 -17267,6 +17416,7 @@@ M:   Thara Gopinath <thara.gopinath@gmail
  L:    linux-crypto@vger.kernel.org
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
 +F:    Documentation/devicetree/bindings/crypto/qcom-qce.yaml
  F:    drivers/crypto/qce/
  
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
@@@ -17430,7 -17280,7 +17430,7 @@@ M:   Vinod Koul <vkoul@kernel.org
  R:    Bhupesh Sharma <bhupesh.sharma@linaro.org>
  L:    netdev@vger.kernel.org
  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
@@@ -17611,8 -17461,9 +17611,8 @@@ F:   drivers/block/rbd.
  F:    drivers/block/rbd_types.h
  
  RAGE128 FRAMEBUFFER DISPLAY DRIVER
 -M:    Paul Mackerras <paulus@samba.org>
  L:    linux-fbdev@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    drivers/video/fbdev/aty/aty128fb.c
  
  RAINSHADOW-CEC DRIVER
@@@ -17635,6 -17486,13 +17635,6 @@@ L:  linux-mips@vger.kernel.or
  S:    Maintained
  F:    arch/mips/boot/dts/ralink/mt7621*
  
 -RALINK PINCTRL DRIVER
 -M:    Arınç ÜNAL <arinc.unal@arinc9.com>
 -M:    Sergio Paracuellos <sergio.paracuellos@gmail.com>
 -L:    linux-mips@vger.kernel.org
 -S:    Maintained
 -F:    drivers/pinctrl/ralink/
 -
  RALINK RT2X00 WIRELESS LAN DRIVER
  M:    Stanislaw Gruszka <stf_xl@wp.pl>
  M:    Helmut Schaa <helmut.schaa@googlemail.com>
@@@ -17682,7 -17540,7 +17682,7 @@@ F:   include/ras/ras_event.
  RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
  L:    linux-wireless@vger.kernel.org
  S:    Orphan
 -F:    drivers/net/wireless/ray*
 +F:    drivers/net/wireless/legacy/ray*
  
  RC-CORE / LIRC FRAMEWORK
  M:    Sean Young <sean@mess.org>
@@@ -17768,7 -17626,7 +17768,7 @@@ M:   Fenghua Yu <fenghua.yu@intel.com
  M:    Reinette Chatre <reinette.chatre@intel.com>
  L:    linux-kernel@vger.kernel.org
  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/
@@@ -17777,13 -17635,11 +17777,13 @@@ READ-COPY UPDATE (RCU
  M:    "Paul E. McKenney" <paulmck@kernel.org>
  M:    Frederic Weisbecker <frederic@kernel.org> (kernel/rcu/tree_nocb.h)
  M:    Neeraj Upadhyay <quic_neeraju@quicinc.com> (kernel/rcu/tasks.h)
 +M:    Joel Fernandes <joel@joelfernandes.org>
  M:    Josh Triplett <josh@joshtriplett.org>
 +M:    Boqun Feng <boqun.feng@gmail.com>
  R:    Steven Rostedt <rostedt@goodmis.org>
  R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  R:    Lai Jiangshan <jiangshanlai@gmail.com>
 -R:    Joel Fernandes <joel@joelfernandes.org>
 +R:    Zqiang <qiang1.zhang@intel.com>
  L:    rcu@vger.kernel.org
  S:    Supported
  W:    http://www.rdrop.com/users/paulmck/RCU/
@@@ -17988,14 -17844,6 +17988,14 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/iio/adc/renesas,rzg2l-adc.yaml
  F:    drivers/iio/adc/rzg2l_adc.c
  
 +RENESAS RZ/G2L MTU3a COUNTER DRIVER
 +M:    Biju Das <biju.das.jz@bp.renesas.com>
 +L:    linux-iio@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/timer/renesas,rz-mtu3.yaml
 +F:    drivers/counter/rz-mtu3-cnt.c
 +
  RENESAS RZ/N1 A5PSW SWITCH DRIVER
  M:    Clément Léger <clement.leger@bootlin.com>
  L:    linux-renesas-soc@vger.kernel.org
@@@ -18241,12 -18089,6 +18241,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 <mazziesaccount@gmail.com>
 +L:    linux-iio@vger.kernel.org
 +S:    Supported
 +F:    drivers/iio/light/rohm-bu27034.c
 +
  ROHM MULTIFUNCTION BD9571MWV-M PMIC DEVICE DRIVERS
  M:    Marek Vasut <marek.vasut+renesas@gmail.com>
  L:    linux-kernel@vger.kernel.org
@@@ -18383,7 -18225,6 +18383,7 @@@ M:   Wedson Almeida Filho <wedsonaf@gmail
  R:    Boqun Feng <boqun.feng@gmail.com>
  R:    Gary Guo <gary@garyguo.net>
  R:    Björn Roy Baron <bjorn3_gh@protonmail.com>
 +R:    Benno Lossin <benno.lossin@proton.me>
  L:    rust-for-linux@vger.kernel.org
  S:    Supported
  W:    https://github.com/Rust-for-Linux/linux
@@@ -18653,7 -18494,6 +18653,7 @@@ M:   Sylwester Nawrocki <s.nawrocki@samsu
  M:    Andrzej Hajda <andrzej.hajda@intel.com>
  L:    linux-media@vger.kernel.org
  S:    Supported
 +F:    Documentation/devicetree/bindings/media/samsung,s5c73m3.yaml
  F:    drivers/media/i2c/s5c73m3/*
  
  SAMSUNG S5K5BAF CAMERA DRIVER
@@@ -18678,11 -18518,6 +18678,11 @@@ M: Sylwester Nawrocki <s.nawrocki@samsu
  L:    linux-media@vger.kernel.org
  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
@@@ -18705,7 -18540,7 +18705,7 @@@ F:   include/linux/clk/samsung.
  
  SAMSUNG SPI DRIVERS
  M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 -M:    Andi Shyti <andi@etezian.org>
 +M:    Andi Shyti <andi.shyti@kernel.org>
  L:    linux-spi@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
@@@ -18772,6 -18607,11 +18772,6 @@@ F:  include/linux/wait.
  F:    include/uapi/linux/sched.h
  F:    kernel/sched/
  
 -SCR24X CHIP CARD INTERFACE DRIVER
 -M:    Lubomir Rintel <lkundrak@v3.sk>
 -S:    Supported
 -F:    drivers/char/pcmcia/scr24x_cs.c
 -
  SCSI RDMA PROTOCOL (SRP) INITIATOR
  M:    Bart Van Assche <bvanassche@acm.org>
  L:    linux-rdma@vger.kernel.org
@@@ -18981,8 -18821,8 +18981,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
@@@ -19068,14 -18908,6 +19068,14 @@@ S: Supporte
  F:    Documentation/networking/devlink/sfc.rst
  F:    drivers/net/ethernet/sfc/
  
 +SFCTEMP HWMON DRIVER
 +M:    Emil Renner Berthing <kernel@esmil.dk>
 +L:    linux-hwmon@vger.kernel.org
 +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 <linux@armlinux.org.uk>
  L:    netdev@vger.kernel.org
@@@ -19164,7 -18996,6 +19164,7 @@@ L:   linux-media@vger.kernel.or
  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
@@@ -19240,7 -19071,6 +19240,7 @@@ M:   Conor Dooley <conor@kernel.org
  L:    linux-riscv@lists.infradead.org
  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
@@@ -19350,12 -19180,6 +19350,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 <michael@walle.cc>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/nvmem/layouts/kontron,sl28-vpd.yaml
 +F:    drivers/nvmem/layouts/sl28vpd.c
 +
  SLAB ALLOCATOR
  M:    Christoph Lameter <cl@linux.com>
  M:    Pekka Enberg <penberg@kernel.org>
@@@ -20078,12 -19902,12 +20078,12 @@@ M:        Emil Renner Berthing <kernel@esmil.d
  S:    Maintained
  F:    arch/riscv/boot/dts/starfive/
  
 -STARFIVE JH7100 CLOCK DRIVERS
 +STARFIVE DWMAC GLUE LAYER
  M:    Emil Renner Berthing <kernel@esmil.dk>
 +M:    Samin Guo <samin.guo@starfivetech.com>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
 -F:    drivers/clk/starfive/clk-starfive-jh7100*
 -F:    include/dt-bindings/clock/starfive-jh7100*.h
 +F:    Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
 +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
  
  STARFIVE JH7110 MMC/SD/SDIO DRIVER
  M:    William Qiu <william.qiu@starfivetech.com>
@@@ -20091,14 -19915,6 +20091,14 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/mmc/starfive*
  F:    drivers/mmc/host/dw_mmc-starfive.c
  
 +STARFIVE JH71X0 CLOCK DRIVERS
 +M:    Emil Renner Berthing <kernel@esmil.dk>
 +M:    Hal Feng <hal.feng@starfivetech.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/clock/starfive,jh71*.yaml
 +F:    drivers/clk/starfive/clk-starfive-jh71*
 +F:    include/dt-bindings/clock/starfive?jh71*.h
 +
  STARFIVE JH71X0 PINCTRL DRIVERS
  M:    Emil Renner Berthing <kernel@esmil.dk>
  M:    Jianlong Huang <jianlong.huang@starfivetech.com>
@@@ -20109,13 -19925,12 +20109,13 @@@ F:        drivers/pinctrl/starfive/pinctrl-sta
  F:    include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
  F:    include/dt-bindings/pinctrl/starfive,jh7110-pinctrl.h
  
 -STARFIVE JH7100 RESET CONTROLLER DRIVER
 +STARFIVE JH71X0 RESET CONTROLLER DRIVERS
  M:    Emil Renner Berthing <kernel@esmil.dk>
 +M:    Hal Feng <hal.feng@starfivetech.com>
  S:    Maintained
  F:    Documentation/devicetree/bindings/reset/starfive,jh7100-reset.yaml
 -F:    drivers/reset/reset-starfive-jh7100.c
 -F:    include/dt-bindings/reset/starfive-jh7100.h
 +F:    drivers/reset/starfive/reset-starfive-jh71*
 +F:    include/dt-bindings/reset/starfive?jh71*.h
  
  STARFIVE JH71XX PMU CONTROLLER DRIVER
  M:    Walker Chen <walker.chen@starfivetech.com>
@@@ -20136,6 -19951,13 +20136,13 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/rng/starfive*
  F:    drivers/char/hw_random/jh7110-trng.c
  
+ STARFIVE WATCHDOG DRIVER
+ M:    Xingyu Wu <xingyu.wu@starfivetech.com>
+ M:    Samin Guo <samin.guo@starfivetech.com>
+ S:    Supported
+ F:    Documentation/devicetree/bindings/watchdog/starfive*
+ F:    drivers/watchdog/starfive-wdt.c
  STATIC BRANCH/CALL
  M:    Peter Zijlstra <peterz@infradead.org>
  M:    Josh Poimboeuf <jpoimboe@kernel.org>
@@@ -20297,7 -20119,7 +20304,7 @@@ M:   John Paul Adrian Glaubitz <glaubitz@
  L:    linux-sh@vger.kernel.org
  S:    Maintained
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
 -F:    Documentation/sh/
 +F:    Documentation/arch/sh/
  F:    arch/sh/
  F:    drivers/sh/
  
@@@ -20357,7 -20179,7 +20364,7 @@@ M:   Vineet Gupta <vgupta@kernel.org
  L:    linux-snps-arc@lists.infradead.org
  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/
@@@ -20956,7 -20778,7 +20963,7 @@@ L:   linux-pm@vger.kernel.or
  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 <hmh@hmh.eng.br>
@@@ -21253,6 -21075,7 +21260,6 @@@ F:   Documentation/hwmon/tmp401.rs
  F:    drivers/hwmon/tmp401.c
  
  TMP464 HARDWARE MONITOR DRIVER
 -M:    Agathe Porte <agathe.porte@nokia.com>
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
@@@ -21415,14 -21238,6 +21422,14 @@@ S: Maintaine
  F:    Documentation/tools/rtla/
  F:    tools/tracing/rtla/
  
 +TECHNICAL ADVISORY BOARD PROCESS DOCS
 +M:    "Theodore Ts'o" <tytso@mit.edu>
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +L:    tech-board-discuss@lists.linux-foundation.org
 +S:    Maintained
 +F:    Documentation/process/researcher-guidelines.rst
 +F:    Documentation/process/contribution-maturity-model.rst
 +
  TRADITIONAL CHINESE DOCUMENTATION
  M:    Hu Haowen <src.res@email.cn>
  L:    linux-doc-tw-discuss@lists.sourceforge.net (moderated for non-subscribers)
@@@ -21557,8 -21372,10 +21564,8 @@@ F:  include/uapi/linux/ublk_cmd.
  UCLINUX (M68KNOMMU AND COLDFIRE)
  M:    Greg Ungerer <gerg@linux-m68k.org>
  L:    linux-m68k@lists.linux-m68k.org
 -L:    uclinux-dev@uclinux.org  (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*/
@@@ -21975,7 -21792,7 +21982,7 @@@ USB WIRELESS RNDIS DRIVER (rndis_wlan
  M:    Jussi Kivilinna <jussi.kivilinna@iki.fi>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
 -F:    drivers/net/wireless/rndis_wlan.c
 +F:    drivers/net/wireless/legacy/rndis_wlan.c
  
  USB XHCI DRIVER
  M:    Mathias Nyman <mathias.nyman@intel.com>
@@@ -22254,7 -22071,6 +22261,7 @@@ F:   include/uapi/linux/virtio_console.
  VIRTIO CORE AND NET DRIVERS
  M:    "Michael S. Tsirkin" <mst@redhat.com>
  M:    Jason Wang <jasowang@redhat.com>
 +R:    Xuan Zhuo <xuanzhuo@linux.alibaba.com>
  L:    virtualization@lists.linux-foundation.org
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-vdpa
@@@ -22268,7 -22084,6 +22275,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/
  
@@@ -22356,9 -22171,7 +22363,9 @@@ L:   virtualization@lists.linux-foundatio
  L:    netdev@vger.kernel.org
  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
  
@@@ -22614,7 -22427,7 +22621,7 @@@ S:   Orpha
  F:    drivers/mmc/host/vub300.c
  
  W1 DALLAS'S 1-WIRE BUS
 -M:    Evgeniy Polyakov <zbr@ioremap.net>
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  S:    Maintained
  F:    Documentation/devicetree/bindings/w1/
  F:    Documentation/w1/
@@@ -22706,9 -22519,8 +22713,8 @@@ S:   Maintaine
  F:    drivers/media/rc/winbond-cir.c
  
  WINSYSTEMS EBC-C384 WATCHDOG DRIVER
- M:    William Breathitt Gray <william.gray@linaro.org>
  L:    linux-watchdog@vger.kernel.org
- S:    Maintained
+ S:    Orphan
  F:    drivers/watchdog/ebc-c384_wdt.c
  
  WINSYSTEMS WS16C48 GPIO DRIVER
@@@ -22733,7 -22545,7 +22739,7 @@@ F:   drivers/input/misc/wistron_btns.
  WL3501 WIRELESS PCMCIA CARD DRIVER
  L:    linux-wireless@vger.kernel.org
  S:    Odd fixes
 -F:    drivers/net/wireless/wl3501*
 +F:    drivers/net/wireless/legacy/wl3501*
  
  WOLFSON MICROELECTRONICS DRIVERS
  L:    patches@opensource.cirrus.com
@@@ -22784,7 -22596,6 +22790,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/core-api/workqueue.rst
  F:    include/linux/workqueue.h
  F:    kernel/workqueue.c
 +F:    kernel/workqueue_internal.h
  
  WWAN DRIVERS
  M:    Loic Poulain <loic.poulain@linaro.org>
@@@ -22833,7 -22644,7 +22839,7 @@@ L:   linux-kernel@vger.kernel.or
  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
@@@ -22843,24 -22654,13 +22849,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 <tglx@linutronix.de>
 +M:    Borislav Petkov <bp@alien8.de>
 +M:    Peter Zijlstra <peterz@infradead.org>
 +M:    Josh Poimboeuf <jpoimboe@kernel.org>
 +R:    Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
 +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 <tony.luck@intel.com>
  M:    Borislav Petkov <bp@alien8.de>
  L:    linux-edac@vger.kernel.org
  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
@@@ -22882,7 -22682,7 +22888,7 @@@ M:   Hans de Goede <hdegoede@redhat.com
  L:    platform-driver-x86@vger.kernel.org
  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 <hdegoede@redhat.com>
@@@ -23129,7 -22929,7 +23135,7 @@@ F:   drivers/net/can/xilinx_can.
  XILINX GPIO DRIVER
  M:    Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
  R:    Srinivas Neeli <srinivas.neeli@xilinx.com>
 -R:    Michal Simek <michal.simek@xilinx.com>
 +R:    Michal Simek <michal.simek@amd.com>
  S:    Maintained
  F:    Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml
  F:    Documentation/devicetree/bindings/gpio/gpio-zynq.yaml
@@@ -23169,6 -22969,14 +23175,14 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/media/platform/xilinx/
  F:    include/uapi/linux/xilinx-v4l2-controls.h
  
+ XILINX WATCHDOG DRIVER
+ M:    Srinivas Neeli <srinivas.neeli@amd.com>
+ R:    Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>
+ R:    Michal Simek <michal.simek@amd.com>
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/watchdog/xlnx,xps-timebase-wdt.yaml
+ F:    drivers/watchdog/of_xilinx_wdt.c
  XILINX XDMA DRIVER
  M:    Lizhi Hou <lizhi.hou@amd.com>
  M:    Brian Xu <brian.xu@amd.com>
@@@ -23231,6 -23039,7 +23245,6 @@@ F:   drivers/i2c/busses/i2c-xlp9xx.
  
  XRA1403 GPIO EXPANDER
  M:    Nandor Han <nandor.han@ge.com>
 -M:    Semi Malinen <semi.malinen@ge.com>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/gpio/gpio-xra1403.txt
@@@ -23320,7 -23129,7 +23334,7 @@@ S:   Maintaine
  F:    arch/x86/kernel/cpu/zhaoxin.c
  
  ZONEFS FILESYSTEM
 -M:    Damien Le Moal <damien.lemoal@opensource.wdc.com>
 +M:    Damien Le Moal <dlemoal@kernel.org>
  M:    Naohiro Aota <naohiro.aota@wdc.com>
  R:    Johannes Thumshirn <jth@kernel.org>
  L:    linux-fsdevel@vger.kernel.org
@@@ -23388,13 -23197,6 +23402,13 @@@ L: linux-mm@kvack.or
  S:    Maintained
  F:    mm/zswap.c
  
 +NXP BLUETOOTH WIRELESS DRIVERS
 +M:    Amitkumar Karwar <amitkumar.karwar@nxp.com>
 +M:    Neeraj Kale <neeraj.sanjaykale@nxp.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml
 +F:    drivers/bluetooth/btnxpuart.c
 +
  THE REST
  M:    Linus Torvalds <torvalds@linux-foundation.org>
  L:    linux-kernel@vger.kernel.org
index 12a6f020b6b595d118d60b4fa02b5933a4b90374,7102dc96573eb12a1bced31ed3c2c1828a1f5d2b..15df74e11a5953ef0483fa0aec26330d95c41067
@@@ -192,7 -192,7 +192,7 @@@ static int watchdog_ping(struct watchdo
  {
        struct watchdog_core_data *wd_data = wdd->wd_data;
  
-       if (!watchdog_active(wdd) && !watchdog_hw_running(wdd))
+       if (!watchdog_hw_running(wdd))
                return 0;
  
        set_bit(_WDOG_KEEPALIVE, &wd_data->status);
@@@ -268,6 -268,7 +268,7 @@@ static int watchdog_start(struct watchd
                trace_watchdog_start(wdd, err);
                if (err == 0) {
                        set_bit(WDOG_ACTIVE, &wdd->status);
+                       set_bit(WDOG_HW_RUNNING, &wdd->status);
                        wd_data->last_keepalive = started_at;
                        wd_data->last_hw_keepalive = started_at;
                        watchdog_update_worker(wdd);
@@@ -1005,6 -1006,7 +1006,6 @@@ static struct miscdevice watchdog_miscd
  
  static struct class watchdog_class = {
        .name =         "watchdog",
 -      .owner =        THIS_MODULE,
        .dev_groups =   wdt_groups,
  };