Merge tag 'timers-core-2022-01-13' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jan 2022 17:02:27 +0000 (09:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jan 2022 17:02:27 +0000 (09:02 -0800)
Pull timer updates from Thomas Gleixner:
 "Updates for the time(r) subsystem:

  Core:

   - Make the clocksource watchdog more robust by better validation
     checks of the measurement.

  Drivers:

   - New drivers for MStar and SSD20xd SOCs

   - The usual cleanups and improvements all over the place"

* tag 'timers-core-2022-01-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  dt-bindings: timer: Add Mstar MSC313e timer devicetree bindings documentation
  clocksource/drivers/msc313e: Add support for ssd20xd-based platforms
  clocksource/drivers: Add MStar MSC313e timer support
  clocksource/drivers/pistachio: Fix -Wunused-but-set-variable warning
  clocksource/drivers/timer-imx-sysctr: Set cpumask to cpu_possible_mask
  clocksource/drivers/imx-sysctr: Mark two variable with __ro_after_init
  clocksource/drivers/renesas,ostm: Make RENESAS_OSTM symbol visible
  clocksource/drivers/renesas-ostm: Add RZ/G2L OSTM support
  dt-bindings: timer: renesas: ostm: Document Renesas RZ/G2L OSTM
  clocksource/drivers/exynos_mct: Fix silly typo resulting in checkpatch warning
  clocksource: Reduce the default clocksource_watchdog() retries to 2
  clocksource: Avoid accidental unstable marking of clocksources
  dt-bindings: timer: tpm-timer: Add imx8ulp compatible string
  reset: Add of_reset_control_get_optional_exclusive()
  clocksource/drivers/exynos_mct: Refactor resources allocation
  dt-bindings: timer: remove rockchip,rk3066-timer compatible string from rockchip,rk-timer.yaml
  dt-bindings: timer: cadence_ttc: Add power-domains

1  2 
Documentation/admin-guide/kernel-parameters.txt
MAINTAINERS

index 685645e75706fa3647ca01ad9eec3009e4bbadf3,3ea934b034f748cebb9d9dba4d58e6cfb17acfb9..4955d2faf4cc0c99cfa89262e93735b2cfbfa36f
                        For broken nForce2 BIOS resulting in XT-PIC timer.
  
        acpi_sleep=     [HW,ACPI] Sleep options
 -                      Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig,
 -                                old_ordering, nonvs, sci_force_enable, nobl }
 +                      Format: { s3_bios, s3_mode, s3_beep, s4_hwsig,
 +                                s4_nohwsig, old_ordering, nonvs,
 +                                sci_force_enable, nobl }
                        See Documentation/power/video.rst for information on
                        s3_bios and s3_mode.
                        s3_beep is for debugging; it makes the PC's speaker beep
                        as soon as the kernel's real-mode entry point is called.
 +                      s4_hwsig causes the kernel to check the ACPI hardware
 +                      signature during resume from hibernation, and gracefully
 +                      refuse to resume if it has changed. This complies with
 +                      the ACPI specification but not with reality, since
 +                      Windows does not do this and many laptops do change it
 +                      on docking. So the default behaviour is to allow resume
 +                      and simply warn when the signature changes, unless the
 +                      s4_hwsig option is enabled.
                        s4_nohwsig prevents ACPI hardware signature from being
 -                      used during resume from hibernation.
 +                      used (or even warned about) during resume.
                        old_ordering causes the ACPI 1.0 ordering of the _PTS
                        control method, with respect to putting devices into
                        low power states, to be enforced (the ACPI 2.0 ordering
        clocksource.max_cswd_read_retries= [KNL]
                        Number of clocksource_watchdog() retries due to
                        external delays before the clock will be marked
-                       unstable.  Defaults to three retries, that is,
-                       four attempts to read the clock under test.
+                       unstable.  Defaults to two retries, that is,
+                       three attempts to read the clock under test.
  
        clocksource.verify_n_cpus= [KNL]
                        Limit the number of CPUs checked for clocksources
                        architectures force reset to be always executed
        i8042.unlock    [HW] Unlock (ignore) the keylock
        i8042.kbdreset  [HW] Reset device connected to KBD port
 +      i8042.probe_defer
 +                      [HW] Allow deferred probing upon i8042 probe errors
  
        i810=           [HW,DRM]
  
                        Default is 1 (enabled)
  
        kvm-intel.emulate_invalid_guest_state=
 -                      [KVM,Intel] Enable emulation of invalid guest states
 -                      Default is 0 (disabled)
 +                      [KVM,Intel] Disable emulation of invalid guest state.
 +                      Ignored if kvm-intel.enable_unrestricted_guest=1, as
 +                      guest state is never invalid for unrestricted guests.
 +                      This param doesn't apply to nested guests (L2), as KVM
 +                      never emulates invalid L2 guest state.
 +                      Default is 1 (enabled)
  
        kvm-intel.flexpriority=
                        [KVM,Intel] Disable FlexPriority feature (TPR shadow).
                        both parameters are enabled, hugetlb_free_vmemmap takes
                        precedence over memory_hotplug.memmap_on_memory.
  
 -      memtest=        [KNL,X86,ARM,PPC,RISCV] Enable memtest
 +      memtest=        [KNL,X86,ARM,M68K,PPC,RISCV] Enable memtest
                        Format: <integer>
                        default : 0 <disable>
                        Specifies the number of memtest passes to be
                        shutdown the other cpus.  Instead use the REBOOT_VECTOR
                        irq.
  
 +      nomodeset       Disable kernel modesetting. DRM drivers will not perform
 +                      display-mode changes or accelerated rendering. Only the
 +                      system framebuffer will be available for use if this was
 +                      set-up by the firmware or boot loader.
 +
 +                      Useful as fallback, or for testing and debugging.
 +
        nomodule        Disable module load
  
        nopat           [X86] Disable PAT (page attribute table extension of
                                Disable the Correctable Errors Collector,
                                see CONFIG_RAS_CEC help text.
  
 -      rcu_nocbs=      [KNL]
 -                      The argument is a cpu list, as described above.
 -
 -                      In kernels built with CONFIG_RCU_NOCB_CPU=y, set
 -                      the specified list of CPUs to be no-callback CPUs.
 -                      Invocation of these CPUs' RCU callbacks will be
 -                      offloaded to "rcuox/N" kthreads created for that
 -                      purpose, where "x" is "p" for RCU-preempt, and
 -                      "s" for RCU-sched, and "N" is the CPU number.
 -                      This reduces OS jitter on the offloaded CPUs,
 -                      which can be useful for HPC and real-time
 -                      workloads.  It can also improve energy efficiency
 -                      for asymmetric multiprocessors.
 +      rcu_nocbs[=cpu-list]
 +                      [KNL] The optional argument is a cpu list,
 +                      as described above.
 +
 +                      In kernels built with CONFIG_RCU_NOCB_CPU=y,
 +                      enable the no-callback CPU mode, which prevents
 +                      such CPUs' callbacks from being invoked in
 +                      softirq context.  Invocation of such CPUs' RCU
 +                      callbacks will instead be offloaded to "rcuox/N"
 +                      kthreads created for that purpose, where "x" is
 +                      "p" for RCU-preempt, "s" for RCU-sched, and "g"
 +                      for the kthreads that mediate grace periods; and
 +                      "N" is the CPU number. This reduces OS jitter on
 +                      the offloaded CPUs, which can be useful for HPC
 +                      and real-time workloads.  It can also improve
 +                      energy efficiency for asymmetric multiprocessors.
 +
 +                      If a cpulist is passed as an argument, the specified
 +                      list of CPUs is set to no-callback mode from boot.
 +
 +                      Otherwise, if the '=' sign and the cpulist
 +                      arguments are omitted, no CPU will be set to
 +                      no-callback mode from boot but the mode may be
 +                      toggled at runtime via cpusets.
  
        rcu_nocb_poll   [KNL]
                        Rather than requiring that offloaded CPUs
                        on rcutree.qhimark at boot time and to zero to
                        disable more aggressive help enlistment.
  
 -      rcutree.rcu_idle_gp_delay= [KNL]
 -                      Set wakeup interval for idle CPUs that have
 -                      RCU callbacks (RCU_FAST_NO_HZ=y).
 -
        rcutree.rcu_kick_kthreads= [KNL]
                        Cause the grace-period kthread to get an extra
                        wake_up() if it sleeps three times longer than
                        in seconds.
  
        rcutorture.fwd_progress= [KNL]
 -                      Enable RCU grace-period forward-progress testing
 +                      Specifies the number of kthreads to be used
 +                      for  RCU grace-period forward-progress testing
                        for the types of RCU supporting this notion.
 +                      Defaults to 1 kthread, values less than zero or
 +                      greater than the number of CPUs cause the number
 +                      of CPUs to be used.
  
        rcutorture.fwd_progress_div= [KNL]
                        Specify the fraction of a CPU-stall-warning
                        period to instead use normal non-expedited
                        grace-period processing.
  
 +      rcupdate.rcu_task_collapse_lim= [KNL]
 +                      Set the maximum number of callbacks present
 +                      at the beginning of a grace period that allows
 +                      the RCU Tasks flavors to collapse back to using
 +                      a single callback queue.  This switching only
 +                      occurs when rcupdate.rcu_task_enqueue_lim is
 +                      set to the default value of -1.
 +
 +      rcupdate.rcu_task_contend_lim= [KNL]
 +                      Set the minimum number of callback-queuing-time
 +                      lock-contention events per jiffy required to
 +                      cause the RCU Tasks flavors to switch to per-CPU
 +                      callback queuing.  This switching only occurs
 +                      when rcupdate.rcu_task_enqueue_lim is set to
 +                      the default value of -1.
 +
 +      rcupdate.rcu_task_enqueue_lim= [KNL]
 +                      Set the number of callback queues to use for the
 +                      RCU Tasks family of RCU flavors.  The default
 +                      of -1 allows this to be automatically (and
 +                      dynamically) adjusted.  This parameter is intended
 +                      for use in testing.
 +
        rcupdate.rcu_task_ipi_delay= [KNL]
                        Set time in jiffies during which RCU tasks will
                        avoid sending IPIs, starting with the beginning
diff --combined MAINTAINERS
index e4cecccbd439bfa4f8db864dc9c993e06d118c03,45c143618ce4e88103ac892aec5245d41160a71a..dc4a1370ef1b44a0942954ca0aeacc9a5b52b809
@@@ -966,7 -966,6 +966,7 @@@ F: drivers/gpu/drm/amd/include/kgd_kfd_
  F:    drivers/gpu/drm/amd/include/v9_structs.h
  F:    drivers/gpu/drm/amd/include/vi_structs.h
  F:    include/uapi/linux/kfd_ioctl.h
 +F:    include/uapi/linux/kfd_sysfs.h
  
  AMD SPI DRIVER
  M:    Sanjay R Mehta <sanju.mehta@amd.com>
@@@ -994,13 -993,6 +994,13 @@@ S:       Supporte
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  F:    drivers/gpu/drm/amd/pm/
  
 +AMD PSTATE DRIVER
 +M:    Huang Rui <ray.huang@amd.com>
 +L:    linux-pm@vger.kernel.org
 +S:    Supported
 +F:    Documentation/admin-guide/pm/amd-pstate.rst
 +F:    drivers/cpufreq/amd-pstate*
 +
  AMD PTDMA DRIVER
  M:    Sanjay R Mehta <sanju.mehta@amd.com>
  L:    dmaengine@vger.kernel.org
@@@ -1147,7 -1139,6 +1147,7 @@@ ANALOG DEVICES INC ADV748X DRIVE
  M:    Kieran Bingham <kieran.bingham@ideasonboard.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/adv748x.yaml
  F:    drivers/media/i2c/adv748x/*
  
  ANALOG DEVICES INC ADV7511 DRIVER
@@@ -1754,21 -1745,17 +1754,21 @@@ B:   https://github.com/AsahiLinux/linux/
  C:    irc://irc.oftc.net/asahi-dev
  T:    git https://github.com/AsahiLinux/linux.git
  F:    Documentation/devicetree/bindings/arm/apple.yaml
 +F:    Documentation/devicetree/bindings/arm/apple/*
  F:    Documentation/devicetree/bindings/i2c/apple,i2c.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
  F:    Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
  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/watchdog/apple,wdt.yaml
  F:    arch/arm64/boot/dts/apple/
  F:    drivers/i2c/busses/i2c-pasemi-core.c
  F:    drivers/i2c/busses/i2c-pasemi-platform.c
  F:    drivers/irqchip/irq-apple-aic.c
  F:    drivers/mailbox/apple-mailbox.c
  F:    drivers/pinctrl/pinctrl-apple-gpio.c
 +F:    drivers/soc/apple/*
  F:    include/dt-bindings/interrupt-controller/apple-aic.h
  F:    include/dt-bindings/pinctrl/apple.h
  F:    include/linux/apple-mailbox.h
@@@ -2304,6 -2291,7 +2304,7 @@@ F:      Documentation/devicetree/bindings/gp
  F:    arch/arm/boot/dts/mstar-*
  F:    arch/arm/mach-mstar/
  F:    drivers/clk/mstar/
+ F:    drivers/clocksource/timer-msc313e.c
  F:    drivers/gpio/gpio-msc313.c
  F:    drivers/rtc/rtc-msc313.c
  F:    drivers/watchdog/msc313e_wdt.c
@@@ -2564,7 -2552,6 +2565,7 @@@ Q:      https://patchwork.kernel.org/project
  F:    Documentation/arm/samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
  F:    Documentation/devicetree/bindings/power/pd-samsung.yaml
 +F:    Documentation/devicetree/bindings/soc/samsung/
  F:    arch/arm/boot/dts/exynos*
  F:    arch/arm/boot/dts/s3c*
  F:    arch/arm/boot/dts/s5p*
@@@ -2591,7 -2578,7 +2592,7 @@@ N:      s3c64x
  N:    s5pv210
  
  ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
 -M:    Andrzej Hajda <a.hajda@samsung.com>
 +M:    Łukasz Stelmach <l.stelmach@samsung.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
  S:    Maintained
@@@ -2615,8 -2602,7 +2616,8 @@@ S:      Maintaine
  F:    drivers/media/platform/s5p-jpeg/
  
  ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
 -M:    Andrzej Hajda <a.hajda@samsung.com>
 +M:    Marek Szyprowski <m.szyprowski@samsung.com>
 +M:    Andrzej Hajda <andrzej.hajda@intel.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
  S:    Maintained
@@@ -2807,15 -2793,12 +2808,15 @@@ L:   linux-arm-kernel@lists.infradead.or
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti.git
  F:    Documentation/devicetree/bindings/arm/toshiba.yaml
 +F:    Documentation/devicetree/bindings/clock/toshiba,tmpv770x-pipllct.yaml
 +F:    Documentation/devicetree/bindings/clock/toshiba,tmpv770x-pismu.yaml
  F:    Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
  F:    Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml
  F:    Documentation/devicetree/bindings/pci/toshiba,visconti-pcie.yaml
  F:    Documentation/devicetree/bindings/pinctrl/toshiba,visconti-pinctrl.yaml
  F:    Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
  F:    arch/arm64/boot/dts/toshiba/
 +F:    drivers/clk/visconti/
  F:    drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
  F:    drivers/gpio/gpio-visconti.c
  F:    drivers/pci/controller/dwc/pcie-visconti.c
@@@ -3016,27 -2999,6 +3017,27 @@@ W:    http://acpi4asus.sf.ne
  F:    drivers/platform/x86/asus*.c
  F:    drivers/platform/x86/eeepc*.c
  
 +ASUS TF103C DOCK DRIVER
 +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/asus-tf103c-dock.c
 +
 +ASUS WMI HARDWARE MONITOR DRIVER
 +M:    Ed Brindley <kernel@maidavale.org>
 +M:    Denis Pauk <pauk.denis@gmail.com>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Maintained
 +F:    drivers/hwmon/asus_wmi_sensors.c
 +
 +ASUS WMI EC HARDWARE MONITOR DRIVER
 +M:    Eugene Shalygin <eugene.shalygin@gmail.com>
 +M:    Denis Pauk <pauk.denis@gmail.com>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Maintained
 +F:    drivers/hwmon/asus_wmi_ec_sensors.c
 +
  ASUS WIRELESS RADIO CONTROL DRIVER
  M:    João Paulo Rechi Vita <jprvita@gmail.com>
  L:    platform-driver-x86@vger.kernel.org
@@@ -3105,7 -3067,7 +3106,7 @@@ F:      Documentation/devicetree/bindings/ph
  F:    drivers/phy/qualcomm/phy-ath79-usb.c
  
  ATHEROS ATH GENERIC UTILITIES
 -M:    Kalle Valo <kvalo@codeaurora.org>
 +M:    Kalle Valo <kvalo@kernel.org>
  L:    linux-wireless@vger.kernel.org
  S:    Supported
  F:    drivers/net/wireless/ath/*
@@@ -3120,7 -3082,7 +3121,7 @@@ W:      https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/ath/ath5k/
  
  ATHEROS ATH6KL WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@codeaurora.org>
 +M:    Kalle Valo <kvalo@kernel.org>
  L:    linux-wireless@vger.kernel.org
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath6kl
@@@ -3419,8 -3381,6 +3420,8 @@@ M:      Jens Axboe <axboe@kernel.dk
  L:    linux-block@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 +F:    Documentation/ABI/stable/sysfs-block
 +F:    Documentation/block/
  F:    block/
  F:    drivers/block/
  F:    include/linux/blk*
@@@ -3610,7 -3570,7 +3611,7 @@@ R:      Florent Revest <revest@chromium.org
  R:    Brendan Jackman <jackmanb@chromium.org>
  L:    bpf@vger.kernel.org
  S:    Maintained
 -F:    Documentation/bpf/bpf_lsm.rst
 +F:    Documentation/bpf/prog_lsm.rst
  F:    include/linux/bpf_lsm.h
  F:    kernel/bpf/bpf_lsm.c
  F:    security/bpf/
@@@ -3677,7 -3637,6 +3678,7 @@@ F:      drivers/net/ethernet/broadcom/bcm490
  F:    drivers/net/ethernet/broadcom/unimac.h
  
  BROADCOM BCM5301X ARM ARCHITECTURE
 +M:    Florian Fainelli <f.fainelli@gmail.com>
  M:    Hauke Mehrtens <hauke@hauke-m.de>
  M:    Rafał Miłecki <zajec5@gmail.com>
  M:    bcm-kernel-feedback-list@broadcom.com
@@@ -3689,7 -3648,6 +3690,7 @@@ F:      arch/arm/boot/dts/bcm953012
  F:    arch/arm/mach-bcm/bcm_5301x.c
  
  BROADCOM BCM53573 ARM ARCHITECTURE
 +M:    Florian Fainelli <f.fainelli@gmail.com>
  M:    Rafał Miłecki <rafal@milecki.pl>
  L:    bcm-kernel-feedback-list@broadcom.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -3733,7 -3691,7 +3734,7 @@@ M:      Al Cooper <alcooperx@gmail.com
  L:    linux-usb@vger.kernel.org
  L:    bcm-kernel-feedback-list@broadcom.com
  S:    Maintained
 -F:    Documentation/devicetree/bindings/usb/brcm,bdc.txt
 +F:    Documentation/devicetree/bindings/usb/brcm,bdc.yaml
  F:    drivers/usb/gadget/udc/bdc/
  
  BROADCOM BMIPS CPUFREQ DRIVER
@@@ -3812,11 -3770,10 +3813,11 @@@ S:   Supporte
  F:    drivers/net/wireless/broadcom/brcm80211/
  
  BROADCOM BRCMSTB GPIO DRIVER
 -M:    Gregory Fong <gregory.0xf0@gmail.com>
 +M:    Doug Berger <opendmb@gmail.com>
 +M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    bcm-kernel-feedback-list@broadcom.com
  S:    Supported
 -F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
 +F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml
  F:    drivers/gpio/gpio-brcmstb.c
  
  BROADCOM BRCMSTB I2C DRIVER
@@@ -3874,7 -3831,7 +3875,7 @@@ M:      Florian Fainelli <f.fainelli@gmail.c
  L:    bcm-kernel-feedback-list@broadcom.com
  L:    netdev@vger.kernel.org
  S:    Supported
 -F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
 +F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml
  F:    Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml
  F:    drivers/net/ethernet/broadcom/genet/
  F:    drivers/net/ethernet/broadcom/unimac.h
@@@ -3916,7 -3873,7 +3917,7 @@@ M:      Rafał Miłecki <rafal@milecki.pl
  M:    bcm-kernel-feedback-list@broadcom.com
  L:    netdev@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/net/brcm,amac.txt
 +F:    Documentation/devicetree/bindings/net/brcm,amac.yaml
  F:    drivers/net/ethernet/broadcom/bgmac*
  F:    drivers/net/ethernet/broadcom/unimac.h
  
@@@ -3991,7 -3948,7 +3992,7 @@@ M:      Markus Mayer <mmayer@broadcom.com
  M:    bcm-kernel-feedback-list@broadcom.com
  L:    linux-pm@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt
 +F:    Documentation/devicetree/bindings/thermal/brcm,avs-tmon.yaml
  F:    drivers/thermal/broadcom/brcmstb*
  
  BROADCOM STB DPFE DRIVER
@@@ -4027,7 -3984,6 +4028,7 @@@ L:      netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
  F:    drivers/net/ethernet/broadcom/unimac.h
 +F:    Documentation/devicetree/bindings/net/brcm,systemport.yaml
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
  M:    Siva Reddy Kallam <siva.kallam@broadcom.com>
@@@ -5467,12 -5423,6 +5468,12 @@@ W:    https://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/platform/sti/delta
  
 +DELTA AHE-50DC FAN CONTROL MODULE DRIVER
 +M:    Zev Weiss <zev@bewilderbeest.net>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Maintained
 +F:    drivers/hwmon/pmbus/delta-ahe50dc-fan.c
 +
  DELTA DPS920AB PSU DRIVER
  M:    Robert Marko <robert.marko@sartura.hr>
  L:    linux-hwmon@vger.kernel.org
@@@ -6100,7 -6050,6 +6101,7 @@@ F:      drivers/gpu/drm/tiny/mi0283qt.
  DRM DRIVER FOR MSM ADRENO GPU
  M:    Rob Clark <robdclark@gmail.com>
  M:    Sean Paul <sean@poorly.run>
 +R:    Abhinav Kumar <quic_abhinavk@quicinc.com>
  L:    linux-arm-msm@vger.kernel.org
  L:    dri-devel@lists.freedesktop.org
  L:    freedreno@lists.freedesktop.org
@@@ -6126,17 -6075,10 +6127,17 @@@ F:   drivers/gpu/drm/panel/panel-novatek-
  
  DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
  M:    Ben Skeggs <bskeggs@redhat.com>
 +M:    Karol Herbst <kherbst@redhat.com>
 +M:    Lyude Paul <lyude@redhat.com>
  L:    dri-devel@lists.freedesktop.org
  L:    nouveau@lists.freedesktop.org
  S:    Supported
 -T:    git git://github.com/skeggsb/linux
 +W:    https://nouveau.freedesktop.org/
 +Q:    https://patchwork.freedesktop.org/project/nouveau/
 +Q:    https://gitlab.freedesktop.org/drm/nouveau/-/merge_requests
 +B:    https://gitlab.freedesktop.org/drm/nouveau/-/issues
 +C:    irc://irc.oftc.net/nouveau
 +T:    git https://gitlab.freedesktop.org/drm/nouveau.git
  F:    drivers/gpu/drm/nouveau/
  F:    include/uapi/drm/nouveau_drm.h
  
@@@ -6369,7 -6311,7 +6370,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/atmel-hlcdc/
  
  DRM DRIVERS FOR BRIDGE CHIPS
 -M:    Andrzej Hajda <a.hajda@samsung.com>
 +M:    Andrzej Hajda <andrzej.hajda@intel.com>
  M:    Neil Armstrong <narmstrong@baylibre.com>
  M:    Robert Foss <robert.foss@linaro.org>
  R:    Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
@@@ -6476,7 -6418,6 +6477,7 @@@ L:      dri-devel@lists.freedesktop.or
  L:    linux-renesas-soc@vger.kernel.org
  S:    Supported
  T:    git git://linuxtv.org/pinchartl/media drm/du/next
 +F:    Documentation/devicetree/bindings/display/bridge/renesas,dsi-csi2-tx.yaml
  F:    Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.yaml
  F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
  F:    Documentation/devicetree/bindings/display/renesas,du.yaml
@@@ -6595,14 -6536,6 +6596,14 @@@ F:    drivers/gpu/drm/drm_panel.
  F:    drivers/gpu/drm/panel/
  F:    include/drm/drm_panel.h
  
 +DRM PRIVACY-SCREEN CLASS
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    dri-devel@lists.freedesktop.org
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/drm_privacy_screen*
 +F:    include/drm/drm_privacy_screen*
 +
  DRM TTM SUBSYSTEM
  M:    Christian Koenig <christian.koenig@amd.com>
  M:    Huang Rui <ray.huang@amd.com>
@@@ -7493,6 -7426,12 +7494,6 @@@ F:     Documentation/firmware_class
  F:    drivers/base/firmware_loader/
  F:    include/linux/firmware.h
  
 -FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
 -M:    Joshua Morris <josh.h.morris@us.ibm.com>
 -M:    Philip Kelleher <pjk1939@linux.ibm.com>
 -S:    Maintained
 -F:    drivers/block/rsxx/
 -
  FLEXTIMER FTM-QUADDEC DRIVER
  M:    Patrick Havelange <patrick.havelange@essensium.com>
  L:    linux-iio@vger.kernel.org
@@@ -7584,7 -7523,6 +7585,7 @@@ F:      include/video
  FREESCALE CAAM (Cryptographic Acceleration and Assurance Module) DRIVER
  M:    Horia Geantă <horia.geanta@nxp.com>
  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
@@@ -8549,12 -8487,6 +8550,12 @@@ F:    drivers/hid
  F:    include/linux/hid*
  F:    include/uapi/linux/hid*
  
 +HID LOGITECH DRIVERS
 +R:    Filipe Laíns <lains@riseup.net>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    drivers/hid/hid-logitech-*
 +
  HID PLAYSTATION DRIVER
  M:    Roderick Colenbrander <roderick.colenbrander@sony.com>
  L:    linux-input@vger.kernel.org
@@@ -8676,10 -8608,8 +8677,10 @@@ F:    drivers/misc/hisi_hikey_usb.
  
  HISILICON PMU DRIVER
  M:    Shaokun Zhang <zhangshaokun@hisilicon.com>
 +M:    Qi Liu <liuqi115@huawei.com>
  S:    Supported
  W:    http://www.hisilicon.com
 +F:    Documentation/admin-guide/perf/hisi-pcie-pmu.rst
  F:    Documentation/admin-guide/perf/hisi-pmu.rst
  F:    drivers/perf/hisilicon
  
@@@ -8710,7 -8640,6 +8711,7 @@@ F:      drivers/scsi/hisi_sas
  
  HISILICON SECURITY ENGINE V2 DRIVER (SEC2)
  M:    Zaibo Xu <xuzaibo@huawei.com>
 +M:    Kai Ye <yekai13@huawei.com>
  L:    linux-crypto@vger.kernel.org
  S:    Maintained
  F:    Documentation/ABI/testing/debugfs-hisi-sec
@@@ -9561,7 -9490,6 +9562,7 @@@ INTEL DRM DRIVERS (excluding Poulsbo, M
  M:    Jani Nikula <jani.nikula@linux.intel.com>
  M:    Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
  M:    Rodrigo Vivi <rodrigo.vivi@intel.com>
 +M:    Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
  L:    intel-gfx@lists.freedesktop.org
  S:    Supported
  W:    https://01.org/linuxgraphics/
@@@ -9756,6 -9684,7 +9757,6 @@@ F:      Documentation/devicetree/bindings/cr
  F:    drivers/crypto/keembay/Kconfig
  F:    drivers/crypto/keembay/Makefile
  F:    drivers/crypto/keembay/keembay-ocs-ecc.c
 -F:    drivers/crypto/keembay/ocs-ecc-curve-defs.h
  
  INTEL KEEM BAY OCS HCU CRYPTO DRIVER
  M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
@@@ -9823,9 -9752,10 +9824,9 @@@ S:     Maintaine
  F:    drivers/mfd/intel_soc_pmic*
  F:    include/linux/mfd/intel_soc_pmic*
  
 -INTEL PMT DRIVER
 -M:    "David E. Box" <david.e.box@linux.intel.com>
 -S:    Maintained
 -F:    drivers/mfd/intel_pmt.c
 +INTEL PMT DRIVERS
 +M:    David E. Box <david.e.box@linux.intel.com>
 +S:    Supported
  F:    drivers/platform/x86/intel/pmt/
  
  INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
@@@ -9892,11 -9822,6 +9893,11 @@@ L:    platform-driver-x86@vger.kernel.or
  S:    Maintained
  F:    drivers/platform/x86/intel/uncore-frequency.c
  
 +INTEL VENDOR SPECIFIC EXTENDED CAPABILITIES DRIVER
 +M:    David E. Box <david.e.box@linux.intel.com>
 +S:    Supported
 +F:    drivers/platform/x86/intel/vsec.*
 +
  INTEL VIRTUAL BUTTON DRIVER
  M:    AceLan Kao <acelan.kao@canonical.com>
  L:    platform-driver-x86@vger.kernel.org
@@@ -10821,13 -10746,6 +10822,13 @@@ S: Maintaine
  W:    http://legousb.sourceforge.net/
  F:    drivers/usb/misc/legousbtower.c
  
 +LETSKETCH HID TABLET DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
 +F:    drivers/hid/hid-letsketch.c
 +
  LG LAPTOP EXTRAS
  M:    Matan Ziv-Av <matan@svgalib.org>
  L:    platform-driver-x86@vger.kernel.org
@@@ -11616,12 -11534,6 +11617,12 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml
  F:    drivers/media/i2c/max9286.c
  
 +MAX96712 QUAD GMSL2 DESERIALIZER DRIVER
 +M:    Niklas Söderlund <niklas.soderlund@ragnatech.se>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/staging/media/max96712/max96712.c
 +
  MAX9860 MONO AUDIO VOICE CODEC DRIVER
  M:    Peter Rosin <peda@axentia.se>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -11657,13 -11569,6 +11658,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml
  F:    drivers/power/supply/max17042_battery.c
  
 +MAXIM MAX20086 CAMERA POWER PROTECTOR DRIVER
 +M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/regulator/maxim,max20086.yaml
 +F:    drivers/regulator/max20086-regulator.c
 +
  MAXIM MAX77650 PMIC MFD DRIVER
  M:    Bartosz Golaszewski <brgl@bgdev.pl>
  L:    linux-kernel@vger.kernel.org
@@@ -11686,12 -11591,6 +11687,12 @@@ F: Documentation/devicetree/bindings/*/
  F:    drivers/regulator/max77802-regulator.c
  F:    include/dt-bindings/*/*max77802.h
  
 +MAXIM MAX77976 BATTERY CHARGER
 +M:    Luca Ceresoli <luca@lucaceresoli.net>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/power/supply/maxim,max77976.yaml
 +F:    drivers/power/supply/max77976_charger.c
 +
  MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
  M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
  M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
@@@ -11706,7 -11605,7 +11707,7 @@@ M:   Krzysztof Kozlowski <krzysztof.kozlo
  M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
 -F:    Documentation/devicetree/bindings/*/max77686.txt
 +F:    Documentation/devicetree/bindings/*/maxim,max77686.yaml
  F:    Documentation/devicetree/bindings/clock/maxim,max77686.txt
  F:    Documentation/devicetree/bindings/mfd/max14577.txt
  F:    Documentation/devicetree/bindings/mfd/max77693.txt
@@@ -12625,13 -12524,6 +12626,13 @@@ L: netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/microchip/lan743x_*
  
 +MICROCHIP LAN966X ETHERNET DRIVER
 +M:    Horatiu Vultur <horatiu.vultur@microchip.com>
 +M:    UNGLinuxDriver@microchip.com
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/microchip/lan966x/*
 +
  MICROCHIP LCDFB DRIVER
  M:    Nicolas Ferre <nicolas.ferre@microchip.com>
  L:    linux-fbdev@vger.kernel.org
@@@ -13357,7 -13249,7 +13358,7 @@@ F:   include/uapi/linux/if_
  F:    include/uapi/linux/netdevice.h
  
  NETWORKING DRIVERS (WIRELESS)
 -M:    Kalle Valo <kvalo@codeaurora.org>
 +M:    Kalle Valo <kvalo@kernel.org>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  Q:    http://patchwork.kernel.org/project/linux-wireless/list/
@@@ -13894,13 -13786,6 +13895,13 @@@ S: Maintaine
  F:    Documentation/hwmon/nzxt-kraken2.rst
  F:    drivers/hwmon/nzxt-kraken2.c
  
 +NZXT-SMART2 HARDWARE MONITORING DRIVER
 +M:    Aleksandr Mezin <mezin.alexander@gmail.com>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/hwmon/nzxt-smart2.rst
 +F:    drivers/hwmon/nzxt-smart2.c
 +
  OBJAGG
  M:    Jiri Pirko <jiri@nvidia.com>
  L:    netdev@vger.kernel.org
@@@ -14213,6 -14098,7 +14214,6 @@@ F:   drivers/media/i2c/ov5647.
  
  OMNIVISION OV5670 SENSOR DRIVER
  M:    Chiranjeevi Rapolu <chiranjeevi.rapolu@intel.com>
 -M:    Hyungwoo Yang <hyungwoo.yang@intel.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -14225,13 -14111,6 +14226,13 @@@ S: Maintaine
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/i2c/ov5675.c
  
 +OMNIVISION OV5693 SENSOR DRIVER
 +M:    Daniel Scally <djrscally@gmail.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/i2c/ov5693.c
 +
  OMNIVISION OV5695 SENSOR DRIVER
  M:    Shunqian Zheng <zhengsq@rock-chips.com>
  L:    linux-media@vger.kernel.org
@@@ -14967,7 -14846,7 +14968,7 @@@ PCIE DRIVER FOR MEDIATE
  M:    Ryder Lee <ryder.lee@mediatek.com>
  M:    Jianjun Wang <jianjun.wang@mediatek.com>
  L:    linux-pci@vger.kernel.org
 -L:    linux-mediatek@lists.infradead.org
 +L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/pci/mediatek*
  F:    drivers/pci/controller/*mediatek*
@@@ -15018,7 -14897,7 +15019,7 @@@ F:   drivers/pci/controller/dwc/*spear
  PCMCIA SUBSYSTEM
  M:    Dominik Brodowski <linux@dominikbrodowski.net>
  S:    Odd Fixes
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git
  F:    Documentation/pcmcia/
  F:    drivers/pcmcia/
  F:    include/pcmcia/
@@@ -15249,11 -15128,6 +15250,11 @@@ 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
 +
  PKTCDVD DRIVER
  M:    linux-block@vger.kernel.org
  S:    Orphan
@@@ -15466,7 -15340,6 +15467,7 @@@ M:   Sergey Senozhatsky <senozhatsky@chro
  R:    Steven Rostedt <rostedt@goodmis.org>
  R:    John Ogness <john.ogness@linutronix.de>
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git
  F:    include/linux/printk.h
  F:    kernel/printk/
  
@@@ -15832,7 -15705,7 +15833,7 @@@ T:   git git://linuxtv.org/anttip/media_t
  F:    drivers/media/tuners/qt1010*
  
  QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@codeaurora.org>
 +M:    Kalle Valo <kvalo@kernel.org>
  L:    ath10k@lists.infradead.org
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
@@@ -15840,7 -15713,7 +15841,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    drivers/net/wireless/ath/ath10k/
  
  QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@codeaurora.org>
 +M:    Kalle Valo <kvalo@kernel.org>
  L:    ath11k@lists.infradead.org
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
@@@ -15854,14 -15727,6 +15855,14 @@@ W: https://wireless.wiki.kernel.org/en/
  F:    Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml
  F:    drivers/net/wireless/ath/ath9k/
  
 +QUALCOMM BAM-DMUX WWAN NETWORK DRIVER
 +M:    Stephan Gerhold <stephan@gerhold.net>
 +L:    netdev@vger.kernel.org
 +L:    linux-arm-msm@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/qcom,bam-dmux.yaml
 +F:    drivers/net/wwan/qcom_bam_dmux.c
 +
  QUALCOMM CAMERA SUBSYSTEM DRIVER
  M:    Robert Foss <robert.foss@linaro.org>
  M:    Todor Tomov <todor.too@gmail.com>
@@@ -15871,15 -15736,6 +15872,15 @@@ F: Documentation/admin-guide/media/qcom
  F:    Documentation/devicetree/bindings/media/*camss*
  F:    drivers/media/platform/qcom/camss/
  
 +QUALCOMM CLOCK DRIVERS
 +M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +L:    linux-arm-msm@vger.kernel.org
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
 +F:    Documentation/devicetree/bindings/clock/qcom,*
 +F:    drivers/clk/qcom/
 +F:    include/dt-bindings/clock/qcom,*
 +
  QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
  M:    Niklas Cassel <nks@flawful.org>
  L:    linux-pm@vger.kernel.org
@@@ -16030,7 -15886,7 +16031,7 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/platform/qcom/venus/
  
  QUALCOMM WCN36XX WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@codeaurora.org>
 +M:    Kalle Valo <kvalo@kernel.org>
  L:    wcn36xx@lists.infradead.org
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wcn36xx
@@@ -16133,7 -15989,6 +16134,7 @@@ F:   arch/mips/generic/board-ranchu.
  RANDOM NUMBER DRIVER
  M:    "Theodore Ts'o" <tytso@mit.edu>
  M:    Jason A. Donenfeld <Jason@zx2c4.com>
 +T:    git https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git
  S:    Maintained
  F:    drivers/char/random.c
  
@@@ -16441,14 -16296,6 +16442,14 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/iio/adc/renesas,rzg2l-adc.yaml
  F:    drivers/iio/adc/rzg2l_adc.c
  
 +RENESAS R-CAR GEN3 & RZ/N1 NAND CONTROLLER DRIVER
 +M:    Miquel Raynal <miquel.raynal@bootlin.com>
 +L:    linux-mtd@lists.infradead.org
 +L:    linux-renesas-soc@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mtd/renesas-nandc.yaml
 +F:    drivers/mtd/nand/raw/renesas-nand-controller.c
 +
  RESET CONTROLLER FRAMEWORK
  M:    Philipp Zabel <p.zabel@pengutronix.de>
  S:    Maintained
@@@ -16619,19 -16466,27 +16620,19 @@@ ROHM POWER MANAGEMENT IC DEVICE DRIVER
  R:    Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
  L:    linux-power@fi.rohmeurope.com
  S:    Supported
 -F:    Documentation/devicetree/bindings/mfd/rohm,bd70528-pmic.txt
 -F:    Documentation/devicetree/bindings/regulator/rohm,bd70528-regulator.txt
  F:    drivers/clk/clk-bd718x7.c
 -F:    drivers/gpio/gpio-bd70528.c
  F:    drivers/gpio/gpio-bd71815.c
  F:    drivers/gpio/gpio-bd71828.c
 -F:    drivers/mfd/rohm-bd70528.c
  F:    drivers/mfd/rohm-bd71828.c
  F:    drivers/mfd/rohm-bd718x7.c
  F:    drivers/mfd/rohm-bd9576.c
 -F:    drivers/power/supply/bd70528-charger.c
 -F:    drivers/regulator/bd70528-regulator.c
  F:    drivers/regulator/bd71815-regulator.c
  F:    drivers/regulator/bd71828-regulator.c
  F:    drivers/regulator/bd718x7-regulator.c
  F:    drivers/regulator/bd9576-regulator.c
  F:    drivers/regulator/rohm-regulator.c
  F:    drivers/rtc/rtc-bd70528.c
 -F:    drivers/watchdog/bd70528_wdt.c
  F:    drivers/watchdog/bd9576_wdt.c
 -F:    include/linux/mfd/rohm-bd70528.h
  F:    include/linux/mfd/rohm-bd71815.h
  F:    include/linux/mfd/rohm-bd71828.h
  F:    include/linux/mfd/rohm-bd718x7.h
@@@ -16982,15 -16837,13 +16983,15 @@@ F:        Documentation/devicetree/bindings/ne
  F:    drivers/nfc/s3fwrn5
  
  SAMSUNG S5C73M3 CAMERA DRIVER
 -M:    Andrzej Hajda <a.hajda@samsung.com>
 +M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
 +M:    Andrzej Hajda <andrzej.hajda@intel.com>
  L:    linux-media@vger.kernel.org
  S:    Supported
  F:    drivers/media/i2c/s5c73m3/*
  
  SAMSUNG S5K5BAF CAMERA DRIVER
 -M:    Andrzej Hajda <a.hajda@samsung.com>
 +M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
 +M:    Andrzej Hajda <andrzej.hajda@intel.com>
  L:    linux-media@vger.kernel.org
  S:    Supported
  F:    drivers/media/i2c/s5k5baf.c
@@@ -17019,8 -16872,10 +17020,8 @@@ M:  Chanwoo Choi <cw00.choi@samsung.com
  L:    linux-samsung-soc@vger.kernel.org
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
 -F:    Documentation/devicetree/bindings/clock/exynos*.txt
  F:    Documentation/devicetree/bindings/clock/samsung,*.yaml
  F:    Documentation/devicetree/bindings/clock/samsung,s3c*
 -F:    Documentation/devicetree/bindings/clock/samsung,s5p*
  F:    drivers/clk/samsung/
  F:    include/dt-bindings/clock/exynos*.h
  F:    include/dt-bindings/clock/s3c*.h
@@@ -17267,13 -17122,6 +17268,13 @@@ L: linux-mmc@vger.kernel.or
  S:    Maintained
  F:    drivers/mmc/host/sdhci-omap.c
  
 +SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) NXP i.MX DRIVER
 +M:    Haibo Chen <haibo.chen@nxp.com>
 +L:    linux-imx@nxp.com
 +L:    linux-mmc@vger.kernel.org
 +S:    Maintained
 +F:    drivers/mmc/host/sdhci-esdhc-imx.c
 +
  SECURE ENCRYPTING DEVICE (SED) OPAL DRIVER
  M:    Jonathan Derrick <jonathan.derrick@intel.com>
  M:    Revanth Rajashekar <revanth.rajashekar@intel.com>
@@@ -17576,7 -17424,7 +17577,7 @@@ F:   drivers/video/fbdev/sm712
  SILVACO I3C DUAL-ROLE MASTER
  M:    Miquel Raynal <miquel.raynal@bootlin.com>
  M:    Conor Culhane <conor.culhane@silvaco.com>
 -L:    linux-i3c@lists.infradead.org
 +L:    linux-i3c@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml
  F:    drivers/i3c/master/svc-i3c-master.c
@@@ -17819,17 -17667,12 +17820,17 @@@ F:        drivers/firmware/arm_sdei.
  F:    include/linux/arm_sdei.h
  F:    include/uapi/linux/arm_sdei.h
  
 -SOFTWARE NODES
 +SOFTWARE NODES AND DEVICE PROPERTIES
  R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 +R:    Daniel Scally <djrscally@gmail.com>
  R:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
 +R:    Sakari Ailus <sakari.ailus@linux.intel.com>
  L:    linux-acpi@vger.kernel.org
  S:    Maintained
 +F:    drivers/base/property.c
  F:    drivers/base/swnode.c
 +F:    include/linux/fwnode.h
 +F:    include/linux/property.h
  
  SOFTWARE RAID (Multiple Disks) SUPPORT
  M:    Song Liu <song@kernel.org>
@@@ -18114,8 -17957,8 +18115,8 @@@ F:   drivers/pinctrl/spear
  
  SPI NOR SUBSYSTEM
  M:    Tudor Ambarus <tudor.ambarus@microchip.com>
 +M:    Pratyush Yadav <p.yadav@ti.com>
  R:    Michael Walle <michael@walle.cc>
 -R:    Pratyush Yadav <p.yadav@ti.com>
  L:    linux-mtd@lists.infradead.org
  S:    Maintained
  W:    http://www.linux-mtd.infradead.org/
@@@ -18314,28 -18157,6 +18315,28 @@@ M: Ion Badulescu <ionut@badula.org
  S:    Odd Fixes
  F:    drivers/net/ethernet/adaptec/starfire*
  
 +STARFIVE JH7100 CLOCK DRIVER
 +M:    Emil Renner Berthing <kernel@esmil.dk>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/clock/starfive,jh7100-clkgen.yaml
 +F:    drivers/clk/starfive/clk-starfive-jh7100.c
 +F:    include/dt-bindings/clock/starfive-jh7100.h
 +
 +STARFIVE JH7100 PINCTRL DRIVER
 +M:    Emil Renner Berthing <kernel@esmil.dk>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
 +F:    drivers/pinctrl/pinctrl-starfive.c
 +F:    include/dt-bindings/pinctrl/pinctrl-starfive.h
 +
 +STARFIVE JH7100 RESET CONTROLLER DRIVER
 +M:    Emil Renner Berthing <kernel@esmil.dk>
 +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
 +
  STATIC BRANCH/CALL
  M:    Peter Zijlstra <peterz@infradead.org>
  M:    Josh Poimboeuf <jpoimboe@redhat.com>
@@@ -18497,7 -18318,6 +18498,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/devicetree/bindings/arc/*
  F:    Documentation/devicetree/bindings/interrupt-controller/snps,arc*
  F:    arch/arc/
@@@ -19515,6 -19335,12 +19516,6 @@@ W:  https://github.com/srcres258/linux-d
  T:    git git://github.com/srcres258/linux-doc.git doc-zh-tw
  F:    Documentation/translations/zh_TW/
  
 -TRIVIAL PATCHES
 -M:    Jiri Kosina <trivial@kernel.org>
 -S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
 -K:    ^Subject:.*(?i)trivial
 -
  TTY LAYER
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  M:    Jiri Slaby <jirislaby@kernel.org>
@@@ -19619,7 -19445,6 +19620,7 @@@ S:   Supporte
  W:    http://www.linux-mtd.infradead.org/doc/ubifs.html
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git next
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git fixes
 +F:    Documentation/ABI/testing/sysfs-fs-ubifs
  F:    Documentation/filesystems/ubifs-authentication.rst
  F:    Documentation/filesystems/ubifs.rst
  F:    fs/ubifs/
@@@ -20371,8 -20196,6 +20372,8 @@@ F:   include/uapi/linux/virtio_gpio.
  VIRTIO GPU DRIVER
  M:    David Airlie <airlied@linux.ie>
  M:    Gerd Hoffmann <kraxel@redhat.com>
 +R:    Gurchetan Singh <gurchetansingh@chromium.org>
 +R:    Chia-I Wu <olvaffe@gmail.com>
  L:    dri-devel@lists.freedesktop.org
  L:    virtualization@lists.linux-foundation.org
  S:    Maintained
@@@ -20606,7 -20429,7 +20607,7 @@@ M:   Sergey Senozhatsky <senozhatsky@chro
  R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  R:    Rasmus Villemoes <linux@rasmusvillemoes.dk>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git
  F:    Documentation/core-api/printk-formats.rst
  F:    lib/test_printf.c
  F:    lib/test_scanf.c
@@@ -20874,13 -20697,6 +20875,13 @@@ S: Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/mm
  F:    arch/x86/mm/
  
 +X86 PLATFORM ANDROID TABLETS DSDT FIXUP DRIVER
 +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
 +
  X86 PLATFORM DRIVERS
  M:    Hans de Goede <hdegoede@redhat.com>
  M:    Mark Gross <markgross@kernel.org>
@@@ -21044,14 -20860,6 +21045,14 @@@ F: drivers/scsi/xen-scsifront.
  F:    drivers/xen/xen-scsiback.c
  F:    include/xen/interface/io/vscsiif.h
  
 +XEN PVUSB DRIVER
 +M:    Juergen Gross <jgross@suse.com>
 +L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
 +L:    linux-usb@vger.kernel.org
 +S:    Supported
 +F:    drivers/usb/host/xen*
 +F:    include/xen/interface/io/usbif.h
 +
  XEN SOUND FRONTEND DRIVER
  M:    Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
@@@ -21252,7 -21060,7 +21253,7 @@@ S:   Maintaine
  F:    arch/x86/kernel/cpu/zhaoxin.c
  
  ZONEFS FILESYSTEM
 -M:    Damien Le Moal <damien.lemoal@wdc.com>
 +M:    Damien Le Moal <damien.lemoal@opensource.wdc.com>
  M:    Naohiro Aota <naohiro.aota@wdc.com>
  R:    Johannes Thumshirn <jth@kernel.org>
  L:    linux-fsdevel@vger.kernel.org