Merge tag 'for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...

Pull power supply and reset updates from Sebastian Reichel:
 "Power-supply core:

   - Introduce "Bypass" charging type used by USB PPS standard

   - Refactor power_supply_set_input_current_limit_from_supplier()

   - Add fwnode support to power_supply_get_battery_info()

  Drivers:

   - ab8500: continue migrating towards using standard core APIs

   - axp288 fuel-gauge: refactor driver to be fully resource managed

   - battery-samsung-sdi: new in-kernel provider for (constant) Samsung
     battery info

   - bq24190: disable boost regulator on shutdown

   - bq24190: add support for battery-info on ACPI based systems

   - bq25890: prepare driver for usage on ACPI based systems

   - bq25890: add boost regulator support

   - cpcap-battery: add NVMEM based battery detection support

   - injoinic ip5xxx: new driver for power bank IC

   - upi ug3105: new battery driver

   - misc small improvements and fixes"

* tag 'for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (94 commits)
  power: ab8500_chargalg: Use CLOCK_MONOTONIC
  power: supply: Add a driver for Injoinic power bank ICs
  dt-bindings: trivial-devices: Add Injoinic power bank ICs
  dt-bindings: vendor-prefixes: Add Injoinic
  power: supply: ab8500: Remove unused variable
  power: supply: da9150-fg: Remove unnecessary print function dev_err()
  power: supply: ab8500: fix a handful of spelling mistakes
  power: supply: ab8500_fg: Account for line impedance
  dt-bindings: power: supply: ab8500_fg: Add line impedance
  power: supply: axp20x_usb_power: fix platform_get_irq.cocci warnings
  power: supply: axp20x_ac_power: fix platform_get_irq.cocci warning
  power: supply: wm8350-power: Add missing free in free_charger_irq
  power: supply: wm8350-power: Handle error for wm8350_register_irq
  power: supply: Static data for Samsung batteries
  power: supply: ab8500_fg: Use VBAT-to-Ri if possible
  power: supply: Support VBAT-to-Ri lookup tables
  power: supply: ab8500: Standardize BTI resistance
  power: supply: ab8500: Standardize alert mode charging
  power: supply: ab8500: Standardize maintenance charging
  power: supply: bq24190_charger: Delay applying charge_type changes when OTG 5V Vbus boost is on
  ...

diff --combined Documentation/ABI/testing/sysfs-class-power
index 8595013667776998f6ad1b60dd79319e8dcd573c,1a04e729cc775d3f6a2265ac0df415dcae4e9c4c..a9ce63cfbe87c79c98bc34718d79817bbeb5645d
--- 1/Documentation/ABI/testing/sysfs-class-power
--- 2/Documentation/ABI/testing/sysfs-class-power
+++ b/Documentation/ABI/testing/sysfs-class-power
@@@ -380,13 -380,17 +380,17 @@@ Description
                algorithm to adjust the charge rate dynamically, without
                any user configuration required. "Custom" means that the charger
                uses the charge_control_* properties as configuration for some
-               different algorithm.
+               different algorithm. "Long Life" means the charger reduces its
+               charging rate in order to prolong the battery health. "Bypass"
+               means the charger bypasses the charging path around the
+               integrated converter allowing for a "smart" wall adaptor to
+               perform the power conversion externally.
  
                Access: Read, Write
  
                Valid values:
                              "Unknown", "N/A", "Trickle", "Fast", "Standard",
-                             "Adaptive", "Custom"
+                             "Adaptive", "Custom", "Long Life", "Bypass"
  
  What:         /sys/class/power_supply/<supply_name>/charge_term_current
  Date:         July 2014
@@@ -468,7 -472,6 +472,7 @@@ Description
                        auto:            Charge normally, respect thresholds
                        inhibit-charge:  Do not charge while AC is attached
                        force-discharge: Force discharge while AC is attached
 +                      ================ ====================================
  
  What:         /sys/class/power_supply/<supply_name>/technology
  Date:         May 2007

diff --combined Documentation/devicetree/bindings/trivial-devices.yaml
index da929cb08463c371e9f09e35c6bb79450723b2e5,a045d627a2974bbbcdefe9cacce07845fcd853e7..e68b1f991da918b510f33ef6a4c5921d857cc43f
--- 1/Documentation/devicetree/bindings/trivial-devices.yaml
--- 2/Documentation/devicetree/bindings/trivial-devices.yaml
+++ b/Documentation/devicetree/bindings/trivial-devices.yaml
@@@ -137,12 -137,18 +137,20 @@@ properties
            - infineon,slb9645tt
              # Infineon TLV493D-A1B6 I2C 3D Magnetic Sensor
            - infineon,tlv493d-a1b6
 +            # Infineon Multi-phase Digital VR Controller xdpe11280
 +          - infineon,xdpe11280
              # Infineon Multi-phase Digital VR Controller xdpe12254
            - infineon,xdpe12254
              # Infineon Multi-phase Digital VR Controller xdpe12284
            - infineon,xdpe12284
+             # Injoinic IP5108 2.0A Power Bank IC with I2C
+           - injoinic,ip5108
+             # Injoinic IP5109 2.1A Power Bank IC with I2C
+           - injoinic,ip5109
+             # Injoinic IP5207 1.2A Power Bank IC with I2C
+           - injoinic,ip5207
+             # Injoinic IP5209 2.4A Power Bank IC with I2C
+           - injoinic,ip5209
              # Inspur Power System power supply unit version 1
            - inspur,ipsps1
              # Intersil ISL29028 Ambient Light and Proximity Sensor
@@@ -339,7 -345,6 +347,7 @@@
              # Thermometer with SPI interface
            - ti,tmp121
            - ti,tmp122
 +          - ti,tmp125
              # Digital Temperature Sensor
            - ti,tmp275
              # TI DC-DC converter on PMBus
@@@ -357,8 -362,6 +365,8 @@@
            - ti,tps544c25
              # Winbond/Nuvoton H/W Monitor
            - winbond,w83793
 +            # Vicor Corporation Digital Supervisor
 +          - vicor,pli1209bc
              # i2c trusted platform module (TPM)
            - winbond,wpct301
  

diff --combined Documentation/devicetree/bindings/vendor-prefixes.yaml
index baed2b007d0e754c5bb5be6639759cae2703b73c,3a1a7b2fbe52a894fc83dc4788719d0b584b70ba..9968205957ff3569caae9aa8df7d26a692a39fcc
--- 1/Documentation/devicetree/bindings/vendor-prefixes.yaml
--- 2/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -23,8 -23,6 +23,8 @@@ patternProperties
    "^(simple-audio-card|st-plgpio|st-spics|ts),.*": true
  
    # Keep list in alphabetical order.
 +  "^100ask,.*":
 +    description: Baiwen.com (100ask).
    "^70mai,.*":
      description: 70mai Co., Ltd.
    "^8dev,.*":
@@@ -63,8 -61,6 +63,8 @@@
      description: Aeroflex Gaisler AB
    "^aesop,.*":
      description: AESOP Embedded Forum
 +  "^airoha,.*":
 +    description: Airoha
    "^al,.*":
      description: Annapurna Labs
    "^alcatel,.*":
@@@ -281,16 -277,12 +281,16 @@@
      description: Hangzhou C-SKY Microsystems Co., Ltd
    "^csq,.*":
      description: Shenzen Chuangsiqi Technology Co.,Ltd.
 +  "^ctera,.*":
 +    description: CTERA Networks Intl.
    "^cubietech,.*":
      description: Cubietech, Ltd.
    "^cui,.*":
      description: CUI Devices
    "^cypress,.*":
      description: Cypress Semiconductor Corporation
 +  "^cyx,.*":
 +    description: Shenzhen CYX Industrial Co., Ltd
    "^cznic,.*":
      description: CZ.NIC, z.s.p.o.
    "^dallas,.*":
@@@ -497,8 -489,6 +497,8 @@@
      deprecated: true
    "^hannstar,.*":
      description: HannStar Display Corporation
 +  "^haochuangyi,.*":
 +    description: Shenzhen Haochuangyi Technology Co.,Ltd
    "^haoyu,.*":
      description: Haoyu Microelectronic Co. Ltd.
    "^hardkernel,.*":
@@@ -571,6 -561,8 +571,8 @@@
      description: InfoVision Optoelectronics Kunshan Co. Ltd.
    "^ingenic,.*":
      description: Ingenic Semiconductor
+   "^injoinic,.*":
+     description: Injoinic Technology Corp.
    "^innolux,.*":
      description: Innolux Corporation
    "^inside-secure,.*":
@@@ -779,8 -771,6 +781,8 @@@
      description: MiraMEMS Sensing Technology Co., Ltd.
    "^mitsubishi,.*":
      description: Mitsubishi Electric Corporation
 +  "^miyoo,.*":
 +    description: Miyoo
    "^mntre,.*":
      description: MNT Research GmbH
    "^modtronix,.*":
@@@ -904,8 -894,6 +906,8 @@@
      description: Ortus Technology Co., Ltd.
    "^osddisplays,.*":
      description: OSD Displays
 +  "^osmc,.*":
 +    description: Sam Nazarko Trading Ltd. (Open Source Media Centre)
    "^ouya,.*":
      description: Ouya Inc.
    "^overkiz,.*":
@@@ -1219,8 -1207,6 +1221,8 @@@
      description: Shenzhen Techstar Electronics Co., Ltd.
    "^terasic,.*":
      description: Terasic Inc.
 +  "^tesla,.*":
 +    description: Tesla, Inc.
    "^tfc,.*":
      description: Three Five Corp
    "^thead,.*":
@@@ -1314,8 -1300,6 +1316,8 @@@
      description: Vertexcom Technologies, Inc.
    "^via,.*":
      description: VIA Technologies, Inc.
 +  "^vicor,.*":
 +    description: Vicor Corporation
    "^videostrong,.*":
      description: Videostrong Technology Co., Ltd.
    "^virtio,.*":
@@@ -1366,8 -1350,6 +1368,8 @@@
      description: WinLink Co., Ltd
    "^winstar,.*":
      description: Winstar Display Corp.
 +  "^wirelesstag,.*":
 +    description: Wireless Tag (qiming yunduan)
    "^wits,.*":
      description: Shenzhen Merrii Technology Co., Ltd. (WITS)
    "^wlf,.*":

diff --combined MAINTAINERS
index b8d749f0de8a032fbfbcef0804ae228909acb1dd,beaf6ac7852427b1dafeffe840704bf37186dbff..cc5d4cd980b4ed42eb0c8cb2b1e8cc19bbbf64ea
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -190,9 -190,8 +190,9 @@@ M: Johannes Berg <johannes@sipsolutions
  L:    [email protected]
  S:    Maintained
  W:    https://wireless.wiki.kernel.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 +Q:    https://patchwork.kernel.org/project/linux-wireless/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
  F:    Documentation/driver-api/80211/cfg80211.rst
  F:    Documentation/networking/regulatory.rst
  F:    include/linux/ieee80211.h
@@@ -389,11 -388,11 +389,11 @@@ L:      [email protected]
  S:    Maintained
  F:    drivers/acpi/arm64
  
 -ACPI I2C MULTI INSTANTIATE DRIVER
 +ACPI SERIAL MULTI INSTANTIATE DRIVER
  M:    Hans de Goede <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/platform/x86/i2c-multi-instantiate.c
 +F:    drivers/platform/x86/serial-multi-instantiate.c
  
  ACPI PCC(Platform Communication Channel) MAILBOX DRIVER
  M:    Sudeep Holla <[email protected]>
@@@ -989,16 -988,6 +989,16 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/platform/x86/amd-pmc.*
  
 +AMD HSMP DRIVER
 +M:    Naveen Krishna Chatradhi <[email protected]>
 +R:    Carlos Bilbao <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/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
 +
  AMD POWERPLAY AND SWSMU
  M:    Evan Quan <[email protected]>
  L:    [email protected]
@@@ -1012,7 -1001,6 +1012,7 @@@ L:      [email protected]
  S:    Supported
  F:    Documentation/admin-guide/pm/amd-pstate.rst
  F:    drivers/cpufreq/amd-pstate*
 +F:    tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py
  
  AMD PTDMA DRIVER
  M:    Sanjay R Mehta <[email protected]>
@@@ -1042,15 -1030,6 +1042,15 @@@ S:    Maintaine
  F:    Documentation/hid/amd-sfh*
  F:    drivers/hid/amd-sfh-hid/
  
 +AMPHION VPU CODEC V4L2 DRIVER
 +M:    Ming Qian <[email protected]>
 +M:    Shijie Qin <[email protected]>
 +M:    Zhou Peng <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/amphion,vpu.yaml
 +F:    drivers/media/platform/amphion/
 +
  AMS AS73211 DRIVER
  M:    Christian Eggers <[email protected]>
  L:    [email protected]
@@@ -1249,6 -1228,18 +1249,6 @@@ S:     Supporte
  F:    drivers/clk/analogbits/*
  F:    include/linux/clk/analogbits*
  
 -ANDES ARCHITECTURE
 -M:    Nick Hu <[email protected]>
 -M:    Greentime Hu <[email protected]>
 -M:    Vincent Chen <[email protected]>
 -S:    Supported
 -T:    git https://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git
 -F:    Documentation/devicetree/bindings/interrupt-controller/andestech,ativic32.txt
 -F:    Documentation/devicetree/bindings/nds32/
 -F:    arch/nds32/
 -N:    nds32
 -K:    nds32
 -
  ANDROID CONFIG FRAGMENTS
  M:    Rob Herring <[email protected]>
  S:    Supported
@@@ -1628,7 -1619,6 +1628,7 @@@ M:      Olof Johansson <[email protected]
  M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +C:    irc://irc.libera.chat/armlinux
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
  F:    arch/arm/boot/dts/Makefile
  F:    arch/arm64/boot/dts/Makefile
@@@ -1636,7 -1626,6 +1636,7 @@@
  ARM SUB-ARCHITECTURES
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +C:    irc://irc.libera.chat/armlinux
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
  F:    arch/arm/mach-*/
  F:    arch/arm/plat-*/
@@@ -1695,9 -1684,9 +1695,9 @@@ S:      Maintaine
  F:    drivers/clk/sunxi/
  
  ARM/Allwinner sunXi SoC support
 -M:    Maxime Ripard <[email protected]>
  M:    Chen-Yu Tsai <[email protected]>
 -R:    Jernej Skrabec <[email protected]>
 +M:    Jernej Skrabec <[email protected]>
 +M:    Samuel Holland <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
@@@ -1777,7 -1766,7 +1777,7 @@@ T:      git https://github.com/AsahiLinux/li
  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/interrupt-controller/apple,*
  F:    Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
  F:    Documentation/devicetree/bindings/pci/apple,pcie.yaml
  F:    Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
@@@ -1790,7 -1779,6 +1790,7 @@@ F:      drivers/irqchip/irq-apple-aic.
  F:    drivers/mailbox/apple-mailbox.c
  F:    drivers/pinctrl/pinctrl-apple-gpio.c
  F:    drivers/soc/apple/*
 +F:    drivers/watchdog/apple_wdt.c
  F:    include/dt-bindings/interrupt-controller/apple-aic.h
  F:    include/dt-bindings/pinctrl/apple.h
  F:    include/linux/apple-mailbox.h
@@@ -2127,6 -2115,13 +2127,6 @@@ F:     Documentation/devicetree/bindings/ar
  F:    arch/arm64/boot/dts/intel/keembay-evm.dts
  F:    arch/arm64/boot/dts/intel/keembay-soc.dtsi
  
 -ARM/INTEL RESEARCH IMOTE/STARGATE 2 MACHINE SUPPORT
 -M:    Jonathan Cameron <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-pxa/stargate2.c
 -F:    drivers/pcmcia/pxa2xx_stargate2.c
 -
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2255,7 -2250,7 +2255,7 @@@ F:      drivers/phy/mediatek
  ARM/Microchip (AT91) SoC support
  M:    Nicolas Ferre <[email protected]>
  M:    Alexandre Belloni <[email protected]>
 -M:    Ludovic Desroches <ludovic.desroches@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@microchip.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  W:    http://www.linux4sam.org
@@@ -2368,7 -2363,6 +2368,7 @@@ L:      [email protected] (moderated 
  S:    Supported
  F:    Documentation/devicetree/bindings/*/*/*npcm*
  F:    Documentation/devicetree/bindings/*/*npcm*
 +F:    Documentation/devicetree/bindings/arm/npcm/*
  F:    arch/arm/boot/dts/nuvoton-npcm*
  F:    arch/arm/mach-npcm/
  F:    drivers/*/*npcm*
@@@ -2379,7 -2373,6 +2379,7 @@@ ARM/NUVOTON WPCM450 ARCHITECTUR
  M:    Jonathan Neuschäfer <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +W:    https://github.com/neuschaefer/wpcm450/wiki
  F:    Documentation/devicetree/bindings/*/*wpcm*
  F:    arch/arm/boot/dts/nuvoton-wpcm450*
  F:    arch/arm/mach-npcm/wpcm450.c
@@@ -2534,7 -2527,6 +2534,7 @@@ M:      Magnus Damm <[email protected]
  L:    [email protected]
  S:    Supported
  Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
 +C:    irc://irc.libera.chat/renesas-soc
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
  F:    Documentation/devicetree/bindings/arm/renesas.yaml
  F:    arch/arm64/boot/dts/renesas/
@@@ -2576,14 -2568,11 +2576,14 @@@ F:   sound/soc/rockchip
  N:    rockchip
  
  ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
 -M:    Krzysztof Kozlowski <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
 +R:    Alim Akhtar <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 +C:    irc://irc.libera.chat/linux-exynos
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
  F:    Documentation/arm/samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
  F:    Documentation/devicetree/bindings/power/pd-samsung.yaml
@@@ -2618,7 -2607,7 +2618,7 @@@ M:      Łukasz Stelmach <l.stelmach@samsung
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/platform/s5p-g2d/
 +F:    drivers/media/platform/samsung/s5p-g2d/
  
  ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT
  M:    Marek Szyprowski <[email protected]>
@@@ -2635,7 -2624,7 +2635,7 @@@ M:      Sylwester Nawrocki <s.nawrocki@samsu
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/platform/s5p-jpeg/
 +F:    drivers/media/platform/samsung/s5p-jpeg/
  
  ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
  M:    Marek Szyprowski <[email protected]>
@@@ -2643,7 -2632,7 +2643,7 @@@ M:      Andrzej Hajda <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/platform/s5p-mfc/
 +F:    drivers/media/platform/samsung/s5p-mfc/
  
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Geert Uytterhoeven <[email protected]>
@@@ -2651,7 -2640,6 +2651,7 @@@ M:      Magnus Damm <[email protected]
  L:    [email protected]
  S:    Supported
  Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
 +C:    irc://irc.libera.chat/renesas-soc
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
  F:    Documentation/devicetree/bindings/arm/renesas.yaml
  F:    arch/arm/boot/dts/emev2*
@@@ -2713,7 -2701,7 +2713,7 @@@ F:      drivers/clocksource/clksrc_st_lpc.
  F:    drivers/cpufreq/sti-cpufreq.c
  F:    drivers/dma/st_fdma*
  F:    drivers/i2c/busses/i2c-st.c
 -F:    drivers/media/platform/sti/c8sectpfe/
 +F:    drivers/media/platform/st/sti/c8sectpfe/
  F:    drivers/media/rc/st_rc.c
  F:    drivers/mmc/host/sdhci-st.c
  F:    drivers/phy/st/phy-miphy28lp.c
@@@ -2744,7 -2732,7 +2744,7 @@@ N:      stm3
  N:    stm
  
  ARM/Synaptics SoC support
 -M:    Jisheng Zhang <[email protected]>
 +M:    Jisheng Zhang <[email protected]>
  M:    Sebastian Hesselbarth <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -2765,14 -2753,6 +2765,14 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/media/tegra-cec.txt
  F:    drivers/media/cec/platform/tegra/
  
 +ARM/TESLA FSD SoC SUPPORT
 +M:    Alim Akhtar <[email protected]>
 +M:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm64/boot/dts/tesla*
 +
  ARM/TETON BGA MACHINE SUPPORT
  M:    "Mark F. Brown" <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -3037,7 -3017,7 +3037,7 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/aspeed-video.txt
 -F:    drivers/media/platform/aspeed-video.c
 +F:    drivers/media/platform/aspeed/
  
  ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
  M:    Corentin Chary <[email protected]>
@@@ -3069,12 -3049,6 +3069,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/hwmon/asus_wmi_ec_sensors.c
  
 +ASUS EC HARDWARE MONITOR DRIVER
 +M:    Eugene Shalygin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hwmon/asus-ec-sensors.c
 +
  ASUS WIRELESS RADIO CONTROL DRIVER
  M:    João Paulo Rechi Vita <[email protected]>
  L:    [email protected]
@@@ -3158,9 -3132,11 +3158,9 @@@ W:     https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/ath/ath5k/
  
  ATHEROS ATH6KL WIRELESS DRIVER
 -M:    Kalle Valo <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Orphan
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath6kl
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath6kl/
  
  ATI_REMOTE2 DRIVER
@@@ -3217,7 -3193,6 +3217,7 @@@ ATOMIC INFRASTRUCTUR
  M:    Will Deacon <[email protected]>
  M:    Peter Zijlstra <[email protected]>
  R:    Boqun Feng <[email protected]>
 +R:    Mark Rutland <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    arch/*/include/asm/atomic*.h
@@@ -3399,7 -3374,7 +3399,7 @@@ L:      [email protected]
  S:    Supported
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/platform/sti/bdisp
 +F:    drivers/media/platform/st/sti/bdisp
  
  BECKHOFF CX5020 ETHERCAT MASTER DRIVER
  M:    Dariusz Marcinkiewicz <[email protected]>
@@@ -3460,7 -3435,6 +3460,7 @@@ F:      Documentation/ABI/stable/sysfs-bloc
  F:    Documentation/block/
  F:    block/
  F:    drivers/block/
 +F:    include/linux/bio.h
  F:    include/linux/blk*
  F:    kernel/trace/blktrace.c
  F:    lib/sbitmap.c
@@@ -3548,8 -3522,6 +3548,8 @@@ F:      net/sched/act_bpf.
  F:    net/sched/cls_bpf.c
  F:    samples/bpf/
  F:    scripts/bpf_doc.py
 +F:    scripts/pahole-flags.sh
 +F:    scripts/pahole-version.sh
  F:    tools/bpf/
  F:    tools/lib/bpf/
  F:    tools/testing/selftests/bpf/
@@@ -3842,6 -3814,9 +3842,6 @@@ BROADCOM BRCM80211 IEEE802.11n WIRELES
  M:    Arend van Spriel <[email protected]>
  M:    Franky Lin <[email protected]>
  M:    Hante Meuleman <[email protected]>
 -M:    Chi-hsien Lin <[email protected]>
 -M:    Wright Feng <[email protected]>
 -M:    Chung-hsien Hsu <[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
@@@ -3925,7 -3900,7 +3925,7 @@@ M:      Scott Branden <[email protected]
  M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -T:    git git://github.com/broadcom/cygnus-linux.git
 +T:    git git://github.com/broadcom/stblinux.git
  F:    arch/arm64/boot/dts/broadcom/northstar2/*
  F:    arch/arm64/boot/dts/broadcom/stingray/*
  F:    drivers/clk/bcm/clk-ns*
@@@ -4181,8 -4156,9 +4181,8 @@@ N:      csk
  K:    csky
  
  CA8210 IEEE-802.15.4 RADIO DRIVER
 -M:    Harry Morris <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://github.com/Cascoda/ca8210-linux.git
  F:    Documentation/devicetree/bindings/net/ieee802154/ca8210.txt
  F:    drivers/net/ieee802154/ca8210.c
@@@ -4263,7 -4239,7 +4263,7 @@@ L:      [email protected]
  S:    Orphan
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/cafe_ccic*
 -F:    drivers/media/platform/marvell-ccic/
 +F:    drivers/media/platform/marvell/
  
  CAIF NETWORK LAYER
  L:    [email protected]
@@@ -4466,7 -4442,6 +4466,7 @@@ F:      drivers/power/supply/cw2015_battery.
  CEPH COMMON CODE (LIBCEPH)
  M:    Ilya Dryomov <[email protected]>
  M:    Jeff Layton <[email protected]>
 +M:    Xiubo Li <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://ceph.com/
@@@ -4477,7 -4452,6 +4477,7 @@@ F:      net/ceph
  
  CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)
  M:    Jeff Layton <[email protected]>
 +M:    Xiubo Li <[email protected]>
  M:    Ilya Dryomov <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -4569,7 -4543,6 +4569,7 @@@ F:      drivers/platform/chrome
  
  CHROMEOS EC CODEC DRIVER
  M:    Cheng-Yi Chiang <[email protected]>
 +M:    Tzung-Bi Shih <[email protected]>
  R:    Guenter Roeck <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
@@@ -4789,7 -4762,7 +4789,7 @@@ M:      Philipp Zabel <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/coda.yaml
 -F:    drivers/media/platform/coda/
 +F:    drivers/media/platform/chips-media/
  
  CODE OF CONDUCT
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -4935,8 -4908,7 +4935,8 @@@ F:      kernel/cgroup/cpuset.
  CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
  M:    Johannes Weiner <[email protected]>
  M:    Michal Hocko <[email protected]>
 -M:    Vladimir Davydov <[email protected]>
 +M:    Roman Gushchin <[email protected]>
 +M:    Shakeel Butt <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -5339,7 -5311,6 +5339,7 @@@ DATA ACCESS MONITO
  M:    SeongJae Park <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-kernel-mm-damon
  F:    Documentation/admin-guide/mm/damon/
  F:    Documentation/vm/damon/
  F:    include/linux/damon.h
@@@ -5433,7 -5404,6 +5433,7 @@@ F:      drivers/platform/x86/dell/dell-rbtn.
  DELL LAPTOP SMM DRIVER
  M:    Pali Rohár <[email protected]>
  S:    Maintained
 +F:    Documentation/ABI/obsolete/procfs-i8k
  F:    drivers/hwmon/dell-smm-hwmon.c
  F:    include/uapi/linux/i8k.h
  
@@@ -5503,7 -5473,7 +5503,7 @@@ L:      [email protected]
  S:    Supported
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/platform/sti/delta
 +F:    drivers/media/platform/st/sti/delta
  
  DELTA AHE-50DC FAN CONTROL MODULE DRIVER
  M:    Zev Weiss <[email protected]>
@@@ -5615,7 -5585,7 +5615,7 @@@ F:      include/linux/devm-helpers.
  
  DEVICE-MAPPER  (LVM)
  M:    Alasdair Kergon <[email protected]>
 -M:    Mike Snitzer <snitzer@redhat.com>
 +M:    Mike Snitzer <snitzer@kernel.org>
  M:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -5763,7 -5733,7 +5763,7 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    Documentation/driver-api/dma-buf.rst
  F:    drivers/dma-buf/
  F:    include/linux/*fence.h
 -F:    include/linux/dma-buf*
 +F:    include/linux/dma-buf.h
  F:    include/linux/dma-resv.h
  K:    \bdma_(?:buf|fence|resv)\b
  
@@@ -5802,7 -5772,7 +5802,7 @@@ F:      tools/testing/selftests/dma
  
  DMA-BUF HEAPS FRAMEWORK
  M:    Sumit Semwal <[email protected]>
 -R:    Benjamin Gaignard <benjamin.gaignard@linaro.org>
 +R:    Benjamin Gaignard <benjamin.gaignard@collabora.com>
  R:    Liam Mark <[email protected]>
  R:    Laura Abbott <[email protected]>
  R:    Brian Starkey <[email protected]>
@@@ -6106,8 -6076,7 +6106,8 @@@ L:      [email protected]
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  S:    Maintained
  F:    drivers/gpu/drm/panel/panel-lvds.c
 -F:    Documentation/devicetree/bindings/display/panel/lvds.yaml
 +F:    Documentation/devicetree/bindings/display/lvds.yaml
 +F:    Documentation/devicetree/bindings/display/panel/panel-lvds.yaml
  
  DRM DRIVER FOR MANTIX MLAF057WE51 PANELS
  M:    Guido Günther <[email protected]>
@@@ -6136,14 -6105,6 +6136,14 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt
  F:    drivers/gpu/drm/tiny/mi0283qt.c
  
 +DRM DRIVER FOR MIPI DBI compatible panels
 +M:    Noralf Trønnes <[email protected]>
 +S:    Maintained
 +W:    https://github.com/notro/panel-mipi-dbi/wiki
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/panel/panel-mipi-dbi-spi.yaml
 +F:    drivers/gpu/drm/tiny/panel-mipi-dbi.c
 +
  DRM DRIVER FOR MSM ADRENO GPU
  M:    Rob Clark <[email protected]>
  M:    Sean Paul <[email protected]>
@@@ -6164,13 -6125,6 +6164,13 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml
  F:    drivers/gpu/drm/panel/panel-novatek-nt35510.c
  
 +DRM DRIVER FOR NOVATEK NT35560 PANELS
 +M:    Linus Walleij <[email protected]>
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/panel/sony,acx424akp.yaml
 +F:    drivers/gpu/drm/panel/panel-novatek-nt35560.c
 +
  DRM DRIVER FOR NOVATEK NT36672A PANELS
  M:    Sumit Semwal <[email protected]>
  S:    Maintained
@@@ -6207,13 -6161,6 +6207,13 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/repaper.txt
  F:    drivers/gpu/drm/tiny/repaper.c
  
 +DRM DRIVER FOR SOLOMON SSD130X OLED DISPLAYS
 +M:    Javier Martinez Canillas <[email protected]>
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
 +F:    drivers/gpu/drm/solomon/ssd130x*
 +
  DRM DRIVER FOR QEMU'S CIRRUS DEVICE
  M:    Dave Airlie <[email protected]>
  M:    Gerd Hoffmann <[email protected]>
@@@ -6302,6 -6249,12 +6302,6 @@@ T:     git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/sitronix,st7735r.yaml
  F:    drivers/gpu/drm/tiny/st7735r.c
  
 -DRM DRIVER FOR SONY ACX424AKP PANELS
 -M:    Linus Walleij <[email protected]>
 -S:    Maintained
 -T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    drivers/gpu/drm/panel/panel-sony-acx424akp.c
 -
  DRM DRIVER FOR ST-ERICSSON MCDE
  M:    Linus Walleij <[email protected]>
  S:    Maintained
@@@ -6348,8 -6301,8 +6348,8 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    drivers/gpu/drm/vboxvideo/
  
  DRM DRIVER FOR VMWARE VIRTUAL GPU
 -M:    "VMware Graphics" <[email protected]>
  M:    Zack Rusin <[email protected]>
 +R:    VMware Graphics Reviewers <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -6549,7 -6502,7 +6549,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/rockchip/
  
  DRM DRIVERS FOR STI
 -M:    Benjamin Gaignard <[email protected]>
 +M:    Alain Volmat <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -6558,8 -6511,8 +6558,8 @@@ F:      drivers/gpu/drm/st
  
  DRM DRIVERS FOR STM
  M:    Yannick Fertre <[email protected]>
 +M:    Raphael Gallais-Pou <[email protected]>
  M:    Philippe Cornu <[email protected]>
 -M:    Benjamin Gaignard <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -7053,6 -7006,12 +7053,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/edac/sb_edac.c
  
 -EDAC-SIFIVE
 -M:    Yash Shah <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/edac/sifive_edac.c
 -
  EDAC-SKYLAKE
  M:    Tony Luck <[email protected]>
  L:    [email protected]
@@@ -7223,7 -7182,7 +7223,7 @@@ F:      drivers/net/can/usb/etas_es58x
  
  ETHERNET BRIDGE
  M:    Roopa Prabhu <[email protected]>
 -M:    Nikolay Aleksandrov <[email protected]>
 +M:    Nikolay Aleksandrov <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
@@@ -7249,10 -7208,8 +7249,10 @@@ F:    drivers/net/mdio/of_mdio.
  F:    drivers/net/pcs/
  F:    drivers/net/phy/
  F:    include/dt-bindings/net/qca-ar803x.h
 +F:    include/linux/linkmode.h
  F:    include/linux/*mdio*.h
  F:    include/linux/mdio/*.h
 +F:    include/linux/mii.h
  F:    include/linux/of_net.h
  F:    include/linux/phy.h
  F:    include/linux/phy_fixed.h
@@@ -7266,9 -7223,6 +7266,9 @@@ F:      net/core/of_net.
  EXEC & BINFMT API
  R:    Eric Biederman <[email protected]>
  R:    Kees Cook <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve
  F:    arch/alpha/kernel/binfmt_loader.c
  F:    arch/x86/ia32/ia32_aout.c
  F:    fs/*binfmt_*.c
@@@ -7276,7 -7230,6 +7276,7 @@@ F:      fs/exec.
  F:    include/linux/binfmts.h
  F:    include/linux/elf.h
  F:    include/uapi/linux/binfmts.h
 +F:    include/uapi/linux/elf.h
  F:    tools/testing/selftests/exec/
  N:    asm/elf.h
  N:    binfmt
@@@ -7312,9 -7265,7 +7312,9 @@@ Extended Verification Module (EVM
  M:    Mimi Zohar <[email protected]>
  L:    [email protected]
  S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
  F:    security/integrity/evm/
 +F:    security/integrity/
  
  EXTENSIBLE FIRMWARE INTERFACE (EFI)
  M:    Ard Biesheuvel <[email protected]>
@@@ -7622,12 -7573,6 +7622,12 @@@ S:    Maintaine
  W:    http://floatingpoint.sourceforge.net/emulator/index.html
  F:    arch/x86/math-emu/
  
 +FRAMEBUFFER CORE
 +M:    Daniel Vetter <[email protected]>
 +F:    drivers/video/fbdev/core/
 +S:    Odd Fixes
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
  FRAMEBUFFER LAYER
  M:    Helge Deller <[email protected]>
  L:    [email protected]
@@@ -7791,7 -7736,8 +7791,7 @@@ M:      Qiang Zhao <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/soc/fsl/qe/
 -F:    include/soc/fsl/*qe*.h
 -F:    include/soc/fsl/*ucc*.h
 +F:    include/soc/fsl/qe/
  
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
  M:    Li Yang <[email protected]>
@@@ -7822,7 -7768,6 +7822,7 @@@ F:      Documentation/devicetree/bindings/mi
  F:    Documentation/devicetree/bindings/soc/fsl/
  F:    drivers/soc/fsl/
  F:    include/linux/fsl/
 +F:    include/soc/fsl/
  
  FREESCALE SOC FS_ENET DRIVER
  M:    Pantelis Antoniou <[email protected]>
@@@ -7833,10 -7778,10 +7833,10 @@@ F:   drivers/net/ethernet/freescale/fs_en
  F:    include/linux/fs_enet_pd.h
  
  FREESCALE SOC SOUND DRIVERS
 -M:    Nicolin Chen <nicoleotsuka@gmail.com>
 +M:    Shengjiu Wang <shengjiu.wang@gmail.com>
  M:    Xiubo Li <[email protected]>
  R:    Fabio Estevam <[email protected]>
 -R:    Shengjiu Wang <shengjiu.wang@gmail.com>
 +R:    Nicolin Chen <nicoleotsuka@gmail.com>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
@@@ -7977,12 -7922,6 +7977,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/fujitsu-tablet.c
  
 +FUNGIBLE ETHERNET DRIVERS
 +M:    Dimitris Michailidis <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ethernet/fungible/
 +
  FUSE: FILESYSTEM IN USERSPACE
  M:    Miklos Szeredi <[email protected]>
  L:    [email protected]
@@@ -8696,7 -8635,7 +8696,7 @@@ S:      Maintaine
  F:    drivers/gpio/gpio-hisi.c
  
  HISILICON HIGH PERFORMANCE RSA ENGINE DRIVER (HPRE)
 -M:    Zaibo Xu <xuzaibo@huawei.com>
 +M:    Longfang Liu <liulongfang@huawei.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/debugfs-hisi-hpre
@@@ -8756,9 -8695,9 +8756,9 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/debugfs-hisi-zip
  F:    drivers/crypto/hisilicon/qm.c
 -F:    drivers/crypto/hisilicon/qm.h
  F:    drivers/crypto/hisilicon/sgl.c
  F:    drivers/crypto/hisilicon/zip/
 +F:    include/linux/hisi_acc_qm.h
  
  HISILICON ROCE DRIVER
  M:    Wenpeng Liang <[email protected]>
@@@ -8776,8 -8715,8 +8776,8 @@@ F:      Documentation/devicetree/bindings/sc
  F:    drivers/scsi/hisi_sas/
  
  HISILICON SECURITY ENGINE V2 DRIVER (SEC2)
 -M:    Zaibo Xu <[email protected]>
  M:    Kai Ye <[email protected]>
 +M:    Longfang Liu <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/debugfs-hisi-sec
@@@ -8808,7 -8747,7 +8808,7 @@@ F:      Documentation/devicetree/bindings/mf
  F:    drivers/mfd/hi6421-spmi-pmic.c
  
  HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT
 -M:    Zaibo Xu <xuzaibo@huawei.com>
 +M:    Weili Qian <qianweili@huawei.com>
  S:    Maintained
  F:    drivers/crypto/hisilicon/trng/trng.c
  
@@@ -8922,7 -8861,7 +8922,7 @@@ L:      [email protected]
  S:    Supported
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/platform/sti/hva
 +F:    drivers/media/platform/st/sti/hva
  
  HWPOISON MEMORY FAILURE HANDLING
  M:    Naoya Horiguchi <[email protected]>
@@@ -8957,12 -8896,6 +8957,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/hi846.c
  
 +HYNIX HI847 SENSOR DRIVER
 +M:    Shawn Tu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/hi847.c
 +
  Hyper-V/Azure CORE AND DRIVERS
  M:    "K. Y. Srinivasan" <[email protected]>
  M:    Haiyang Zhang <[email protected]>
@@@ -9317,15 -9250,6 +9317,15 @@@ S:    Maintaine
  W:    https://github.com/o2genum/ideapad-slidebar
  F:    drivers/input/misc/ideapad_slidebar.c
  
 +IDMAPPED MOUNTS
 +M:    Christian Brauner <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git
 +F:    Documentation/filesystems/idmappings.rst
 +F:    tools/testing/selftests/mount_setattr/
 +F:    include/linux/mnt_idmapping.h
 +
  IDT VersaClock 5 CLOCK DRIVER
  M:    Luca Ceresoli <[email protected]>
  S:    Maintained
@@@ -9537,6 -9461,11 +9537,11 @@@ F:    include/linux/mfd/ingenic-tcu.
  F:    sound/soc/codecs/jz47*
  F:    sound/soc/jz4740/
  
+ INJOINIC IP5xxx POWER BANK IC DRIVER
+ M:    Samuel Holland <[email protected]>
+ S:    Maintained
+ F:    drivers/power/supply/ip5xxx_power.c
+ 
  INOTIFY
  M:    Jan Kara <[email protected]>
  R:    Amir Goldstein <[email protected]>
@@@ -9583,7 -9512,6 +9588,7 @@@ L:      [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
  F:    security/integrity/ima/
 +F:    security/integrity/
  
  INTEL 810/815 FRAMEBUFFER DRIVER
  M:    Antonino Daplas <[email protected]>
@@@ -9944,13 -9872,6 +9949,13 @@@ S:    Maintaine
  F:    arch/x86/include/asm/intel_scu_ipc.h
  F:    drivers/platform/x86/intel_scu_*
  
 +INTEL SDSI DRIVER
 +M:    David E. Box <[email protected]>
 +S:    Supported
 +F:    drivers/platform/x86/intel/sdsi.c
 +F:    tools/arch/x86/intel_sdsi/
 +F:    tools/testing/selftests/drivers/sdsi/
 +
  INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER
  M:    Daniel Scally <[email protected]>
  S:    Maintained
@@@ -9987,7 -9908,7 +9992,7 @@@ INTEL UNCORE FREQUENCY CONTRO
  M:    Srinivas Pandruvada <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/platform/x86/intel/uncore-frequency.c
 +F:    drivers/platform/x86/intel/uncore-frequency/
  
  INTEL VENDOR SPECIFIC EXTENDED CAPABILITIES DRIVER
  M:    David E. Box <[email protected]>
@@@ -10084,14 -10005,6 +10089,14 @@@ L: [email protected]
  F:    Documentation/devicetree/bindings/counter/interrupt-counter.yaml
  F:    drivers/counter/interrupt-cnt.c
  
 +INTERSIL ISL7998X VIDEO DECODER DRIVER
 +M:    Michael Tretter <[email protected]>
 +R:    Pengutronix Kernel Team <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/isil,isl79987.yaml
 +F:    drivers/media/i2c/isl7998x.c
 +
  INVENSENSE ICM-426xx IMU DRIVER
  M:    Jean-Baptiste Maneyrol <[email protected]>
  L:    [email protected]
@@@ -10139,13 -10052,6 +10144,13 @@@ F: include/linux/iova.
  F:    include/linux/of_iommu.h
  F:    include/uapi/linux/iommu.h
  
 +IOSYS-MAP HELPERS
 +M:    Thomas Zimmermann <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    include/linux/iosys-map.h
 +
  IO_URING
  M:    Jens Axboe <[email protected]>
  R:    Pavel Begunkov <[email protected]>
@@@ -10398,7 -10304,7 +10403,7 @@@ M:   Mikhail Ulyanov <mikhail.ulyanov@cog
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/platform/rcar_jpu.c
 +F:    drivers/media/platform/renesas/rcar_jpu.c
  
  JSM Neo PCI based serial card
  L:    [email protected]
@@@ -10537,8 -10443,6 +10542,8 @@@ KERNEL REGRESSION
  M:    Thorsten Leemhuis <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/admin-guide/reporting-regressions.rst
 +F:    Documentation/process/handling-regressions.rst
  
  KERNEL SELFTEST FRAMEWORK
  M:    Shuah Khan <[email protected]>
@@@ -10646,8 -10550,8 +10651,8 @@@ F:   arch/riscv/kvm
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <[email protected]>
  M:    Janosch Frank <[email protected]>
 +M:    Claudio Imbrenda <[email protected]>
  R:    David Hildenbrand <[email protected]>
 -R:    Claudio Imbrenda <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -10744,14 -10648,6 +10749,14 @@@ F: include/linux/keyctl.
  F:    include/uapi/linux/keyctl.h
  F:    security/keys/
  
 +KEYS/KEYRINGS_INTEGRITY
 +M:    Jarkko Sakkinen <[email protected]>
 +M:    Mimi Zohar <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    security/integrity/platform_certs
 +
  KFENCE
  M:    Alexander Potapenko <[email protected]>
  M:    Marco Elver <[email protected]>
@@@ -10857,6 -10753,7 +10862,6 @@@ L7 BPF FRAMEWOR
  M:    John Fastabend <[email protected]>
  M:    Daniel Borkmann <[email protected]>
  M:    Jakub Sitnicki <[email protected]>
 -M:    Lorenz Bauer <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -10985,12 -10882,6 +10990,12 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    drivers/ata/pata_arasan_cf.c
  F:    include/linux/pata_arasan_cf_data.h
  
 +LIBATA PATA DRIVERS
 +R:    Sergey Shtylyov <[email protected]>
 +L:    [email protected]
 +F:    drivers/ata/ata_*.c
 +F:    drivers/ata/pata_*.c
 +
  LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
@@@ -11221,17 -11112,12 +11226,17 @@@ F:        lib/list-test.
  LITEX PLATFORM
  M:    Karol Gugala <[email protected]>
  M:    Mateusz Holenko <[email protected]>
 +M:    Gabriel Somlo <[email protected]>
 +M:    Joel Stanley <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/*/litex,*.yaml
  F:    arch/openrisc/boot/dts/or1klitex.dts
 -F:    drivers/soc/litex/litex_soc_ctrl.c
 -F:    drivers/tty/serial/liteuart.c
  F:    include/linux/litex.h
 +F:    drivers/tty/serial/liteuart.c
 +F:    drivers/soc/litex/*
 +F:    drivers/net/ethernet/litex/*
 +F:    drivers/mmc/host/litex_mmc.c
 +N:    litex
  
  LIVE PATCHING
  M:    Josh Poimboeuf <[email protected]>
@@@ -11424,13 -11310,6 +11429,13 @@@ S: Maintaine
  W:    http://linux-test-project.github.io/
  T:    git git://github.com/linux-test-project/ltp.git
  
 +LYNX 28G SERDES PHY DRIVER
 +M:    Ioana Ciornei <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/phy/fsl,lynx-28g.yaml
 +F:    drivers/phy/freescale/phy-fsl-lynx-28g.c
 +
  LYNX PCS MODULE
  M:    Ioana Ciornei <[email protected]>
  L:    [email protected]
@@@ -11492,9 -11371,8 +11497,9 @@@ M:   Johannes Berg <johannes@sipsolutions
  L:    [email protected]
  S:    Maintained
  W:    https://wireless.wiki.kernel.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 +Q:    https://patchwork.kernel.org/project/linux-wireless/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
 +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]
@@@ -11778,7 -11656,7 +11783,7 @@@ F:   drivers/iio/proximity/mb1232.
  
  MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS
  R:    Iskren Chernev <[email protected]>
 -R:    Krzysztof Kozlowski <krz[email protected]>
 +R:    Krzysztof Kozlowski <krz[email protected]>
  R:    Marek Szyprowski <[email protected]>
  R:    Matheus Castello <[email protected]>
  L:    [email protected]
@@@ -11788,7 -11666,7 +11793,7 @@@ F:   drivers/power/supply/max17040_batter
  
  MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS
  R:    Hans de Goede <[email protected]>
 -R:    Krzysztof Kozlowski <krz[email protected]>
 +R:    Krzysztof Kozlowski <krz[email protected]>
  R:    Marek Szyprowski <[email protected]>
  R:    Sebastian Krzyszkowiak <[email protected]>
  R:    Purism Kernel Team <[email protected]>
@@@ -11822,7 -11700,7 +11827,7 @@@ MAXIM MAX77802 PMIC REGULATOR DEVICE DR
  M:    Javier Martinez Canillas <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/*/*max77802.txt
 +F:    Documentation/devicetree/bindings/*/*max77802.yaml
  F:    drivers/regulator/max77802-regulator.c
  F:    include/dt-bindings/*/*max77802.h
  
@@@ -11833,26 -11711,23 +11838,26 @@@ F:        Documentation/devicetree/bindings/po
  F:    drivers/power/supply/max77976_charger.c
  
  MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml
  F:    drivers/power/supply/max14577_charger.c
  F:    drivers/power/supply/max77693_charger.c
  
  MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
  M:    Chanwoo Choi <[email protected]>
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/devicetree/bindings/*/maxim,max14577.yaml
  F:    Documentation/devicetree/bindings/*/maxim,max77686.yaml
 +F:    Documentation/devicetree/bindings/*/maxim,max77843.yaml
  F:    Documentation/devicetree/bindings/clock/maxim,max77686.txt
 -F:    Documentation/devicetree/bindings/mfd/max14577.txt
  F:    Documentation/devicetree/bindings/mfd/max77693.txt
 +F:    drivers/*/*max77843.c
  F:    drivers/*/max14577*.c
  F:    drivers/*/max77686*.c
  F:    drivers/*/max77693*.c
@@@ -11948,7 -11823,7 +11953,7 @@@ M:   Philipp Zabel <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/platform/imx-pxp.[ch]
 +F:    drivers/media/platform/nxp/imx-pxp.[ch]
  
  MEDIA DRIVERS FOR ASCOT2E
  M:    Sergey Kozlov <[email protected]>
@@@ -12013,10 -11888,10 +12018,10 @@@ L:        [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/imx7.rst
 +F:    Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml
  F:    Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
 -F:    Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml
 +F:    drivers/media/platform/imx/imx-mipi-csis.c
  F:    drivers/staging/media/imx/imx7-media-csi.c
 -F:    drivers/staging/media/imx/imx7-mipi-csis.c
  
  MEDIA DRIVERS FOR HELENE
  M:    Abylay Ospan <[email protected]>
@@@ -12071,7 -11946,7 +12076,7 @@@ L:   [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
 -F:    drivers/staging/media/tegra-vde/
 +F:    drivers/media/platform/nvidia/tegra-vde/
  
  MEDIA DRIVERS FOR RENESAS - CEU
  M:    Jacopo Mondi <[email protected]>
@@@ -12080,7 -11955,7 +12085,7 @@@ L:   [email protected]
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,ceu.yaml
 -F:    drivers/media/platform/renesas-ceu.c
 +F:    drivers/media/platform/renesas/renesas-ceu.c
  F:    include/media/drv-intf/renesas-ceu.h
  
  MEDIA DRIVERS FOR RENESAS - DRIF
@@@ -12090,7 -11965,7 +12095,7 @@@ L:   [email protected]
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,drif.yaml
 -F:    drivers/media/platform/rcar_drif.c
 +F:    drivers/media/platform/renesas/rcar_drif.c
  
  MEDIA DRIVERS FOR RENESAS - FCP
  M:    Laurent Pinchart <[email protected]>
@@@ -12099,7 -11974,7 +12104,7 @@@ L:   [email protected]
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,fcp.yaml
 -F:    drivers/media/platform/rcar-fcp.c
 +F:    drivers/media/platform/renesas/rcar-fcp.c
  F:    include/media/rcar-fcp.h
  
  MEDIA DRIVERS FOR RENESAS - FDP1
@@@ -12109,7 -11984,7 +12114,7 @@@ L:   [email protected]
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,fdp1.yaml
 -F:    drivers/media/platform/rcar_fdp1.c
 +F:    drivers/media/platform/renesas/rcar_fdp1.c
  
  MEDIA DRIVERS FOR RENESAS - VIN
  M:    Niklas Söderlund <[email protected]>
@@@ -12120,8 -11995,8 +12125,8 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/renesas,csi2.yaml
  F:    Documentation/devicetree/bindings/media/renesas,isp.yaml
  F:    Documentation/devicetree/bindings/media/renesas,vin.yaml
 -F:    drivers/media/platform/rcar-isp.c
 -F:    drivers/media/platform/rcar-vin/
 +F:    drivers/media/platform/renesas/rcar-isp.c
 +F:    drivers/media/platform/renesas/rcar-vin/
  
  MEDIA DRIVERS FOR RENESAS - VSP1
  M:    Laurent Pinchart <[email protected]>
@@@ -12131,7 -12006,7 +12136,7 @@@ L:   [email protected]
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,vsp1.yaml
 -F:    drivers/media/platform/vsp1/
 +F:    drivers/media/platform/renesas/vsp1/
  
  MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs
  L:    [email protected]
@@@ -12153,7 -12028,7 +12158,7 @@@ L:   [email protected]
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
 -F:    drivers/media/platform/stm32/stm32-dcmi.c
 +F:    drivers/media/platform/st/stm32/stm32-dcmi.c
  
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <[email protected]>
@@@ -12237,7 -12112,7 +12242,7 @@@ M:   Rick Chang <[email protected]
  M:    Bin Liu <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
 -F:    drivers/media/platform/mtk-jpeg/
 +F:    drivers/media/platform/mediatek/jpeg/
  
  MEDIATEK MDP DRIVER
  M:    Minghsiu Tsai <[email protected]>
@@@ -12245,8 -12120,8 +12250,8 @@@ M:   Houlong Wei <[email protected]
  M:    Andrew-CT Chen <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/media/mediatek-mdp.txt
 -F:    drivers/media/platform/mtk-mdp/
 -F:    drivers/media/platform/mtk-vpu/
 +F:    drivers/media/platform/mediatek/mdp/
 +F:    drivers/media/platform/mediatek/vpu/
  
  MEDIATEK MEDIA DRIVER
  M:    Tiffany Lin <[email protected]>
@@@ -12254,8 -12129,8 +12259,8 @@@ M:   Andrew-CT Chen <andrew-ct.chen@media
  S:    Supported
  F:    Documentation/devicetree/bindings/media/mediatek-vcodec.txt
  F:    Documentation/devicetree/bindings/media/mediatek-vpu.txt
 -F:    drivers/media/platform/mtk-vcodec/
 -F:    drivers/media/platform/mtk-vpu/
 +F:    drivers/media/platform/mediatek/vcodec/
 +F:    drivers/media/platform/mediatek/vpu/
  
  MEDIATEK MMC/SD/SDIO DRIVER
  M:    Chaotian Jing <[email protected]>
@@@ -12271,7 -12146,6 +12276,7 @@@ R:   Shayne Chen <[email protected]
  R:    Sean Wang <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
  F:    drivers/net/wireless/mediatek/mt76/
  
  MEDIATEK MT7601U WIRELESS LAN DRIVER
@@@ -12527,7 -12401,7 +12532,7 @@@ F:   include/uapi/linux/membarrier.
  F:    kernel/sched/membarrier.c
  
  MEMBLOCK
 -M:    Mike Rapoport <rppt@linux.ibm.com>
 +M:    Mike Rapoport <rppt@kernel.org>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/core-api/boot-time-mm.rst
@@@ -12535,7 -12409,7 +12540,7 @@@ F:   include/linux/memblock.
  F:    mm/memblock.c
  
  MEMORY CONTROLLER DRIVERS
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
@@@ -12631,7 -12505,7 +12636,7 @@@ L:   [email protected]
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
 -F:    drivers/media/platform/meson/ge2d/
 +F:    drivers/media/platform/amlogic/meson-ge2d/
  
  MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
  M:    Liang Yang <[email protected]>
@@@ -12713,13 -12587,6 +12718,13 @@@ L: [email protected] (moderat
  S:    Supported
  F:    sound/soc/atmel
  
 +MICROCHIP CSI2DC DRIVER
 +M:    Eugen Hristev <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/media/microchip,csi2dc.yaml
 +F:    drivers/media/platform/atmel/microchip-csi2dc.c
 +
  MICROCHIP ECC DRIVER
  M:    Tudor Ambarus <[email protected]>
  L:    [email protected]
@@@ -12745,8 -12612,11 +12750,8 @@@ L:  [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/media/atmel,isc.yaml
  F:    Documentation/devicetree/bindings/media/microchip,xisc.yaml
 -F:    drivers/media/platform/atmel/atmel-isc-base.c
 -F:    drivers/media/platform/atmel/atmel-isc-regs.h
 -F:    drivers/media/platform/atmel/atmel-isc.h
 -F:    drivers/media/platform/atmel/atmel-sama5d2-isc.c
 -F:    drivers/media/platform/atmel/atmel-sama7g5-isc.c
 +F:    drivers/media/platform/atmel/atmel-isc*
 +F:    drivers/media/platform/atmel/atmel-sama*-isc*
  F:    include/linux/atmel-isc-media.h
  
  MICROCHIP ISI DRIVER
@@@ -13429,8 -13299,8 +13434,8 @@@ W:   http://www.iptables.org
  W:    http://www.nftables.org/
  Q:    http://patchwork.ozlabs.org/project/netfilter-devel/list/
  C:    irc://irc.libera.chat/netfilter
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git
  F:    include/linux/netfilter*
  F:    include/linux/netfilter/
  F:    include/net/netfilter/
@@@ -13487,7 -13357,6 +13492,7 @@@ F:   net/core/drop_monitor.
  NETWORKING DRIVERS
  M:    "David S. Miller" <[email protected]>
  M:    Jakub Kicinski <[email protected]>
 +M:    Paolo Abeni <[email protected]>
  L:    [email protected]
  S:    Maintained
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
@@@ -13510,10 -13379,9 +13515,10 @@@ NETWORKING DRIVERS (WIRELESS
  M:    Kalle Valo <[email protected]>
  L:    [email protected]
  S:    Maintained
 -Q:    http://patchwork.kernel.org/project/linux-wireless/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
 +W:    https://wireless.wiki.kernel.org/
 +Q:    https://patchwork.kernel.org/project/linux-wireless/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
  F:    Documentation/devicetree/bindings/net/wireless/
  F:    drivers/net/wireless/
  
@@@ -13534,7 -13402,6 +13539,7 @@@ F:   tools/testing/selftests/drivers/net/
  NETWORKING [GENERAL]
  M:    "David S. Miller" <[email protected]>
  M:    Jakub Kicinski <[email protected]>
 +M:    Paolo Abeni <[email protected]>
  L:    [email protected]
  S:    Maintained
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
@@@ -13587,11 -13454,7 +13592,11 @@@ L: [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
  F:    arch/x86/net/*
 +F:    include/linux/ip.h
 +F:    include/linux/ipv6*
 +F:    include/net/fib*
  F:    include/net/ip*
 +F:    include/net/route.h
  F:    net/ipv4/
  F:    net/ipv6/
  
@@@ -13652,6 -13515,10 +13657,6 @@@ F:  include/net/tls.
  F:    include/uapi/linux/tls.h
  F:    net/tls/*
  
 -NETWORKING [WIRELESS]
 -L:    [email protected]
 -Q:    http://patchwork.kernel.org/project/linux-wireless/list/
 -
  NETXEN (1/10) GbE SUPPORT
  M:    Manish Chopra <[email protected]>
  M:    Rahul Verma <[email protected]>
@@@ -13678,7 -13545,7 +13683,7 @@@ F:   include/uapi/linux/nexthop.
  F:    net/ipv4/nexthop.c
  
  NFC SUBSYSTEM
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  L:    [email protected] (subscribers-only)
  L:    [email protected]
  S:    Maintained
@@@ -13699,7 -13566,7 +13704,7 @@@ F:   tools/testing/selftests/nci
  
  NFS, SUNRPC, AND LOCKD CLIENTS
  M:    Trond Myklebust <[email protected]>
 -M:    Anna Schumaker <anna[email protected]>
 +M:    Anna Schumaker <anna@kernel.org>
  L:    [email protected]
  S:    Maintained
  W:    http://client.linux-nfs.org
@@@ -13812,7 -13679,7 +13817,7 @@@ F:   scripts/nsdep
  NTB AMD DRIVER
  M:    Sanjay R Mehta <[email protected]>
  M:    Shyam Sundar S K <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    drivers/ntb/hw/amd/
  
@@@ -13820,7 -13687,7 +13825,7 @@@ NTB DRIVER COR
  M:    Jon Mason <[email protected]>
  M:    Dave Jiang <[email protected]>
  M:    Allen Hubbe <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Supported
  W:    https://github.com/jonmason/ntb/wiki
  T:    git git://github.com/jonmason/ntb.git
@@@ -13832,13 -13699,13 +13837,13 @@@ F:        tools/testing/selftests/ntb
  
  NTB IDT DRIVER
  M:    Serge Semin <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    drivers/ntb/hw/idt/
  
  NTB INTEL DRIVER
  M:    Dave Jiang <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Supported
  W:    https://github.com/davejiang/linux/wiki
  T:    git https://github.com/davejiang/linux.git
@@@ -13992,7 -13859,7 +13997,7 @@@ F:   Documentation/devicetree/bindings/re
  F:    drivers/regulator/pf8x00-regulator.c
  
  NXP PTN5150A CC LOGIC AND EXTCON DRIVER
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
@@@ -14205,7 -14072,7 +14210,7 @@@ M:   Laurent Pinchart <laurent.pinchart@i
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/ti,omap3isp.txt
 -F:    drivers/media/platform/omap3isp/
 +F:    drivers/media/platform/ti/omap3isp/
  F:    drivers/staging/media/omap4iss/
  
  OMAP MMC SUPPORT
@@@ -14313,12 -14180,6 +14318,12 @@@ M: Harald Welte <[email protected]
  S:    Maintained
  F:    drivers/char/pcmcia/cm4040_cs.*
  
 +OMNIVISION OG01A1B SENSOR DRIVER
 +M:    Shawn Tu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/og01a1b.c
 +
  OMNIVISION OV02A10 SENSOR DRIVER
  M:    Dongchun Zhu <[email protected]>
  L:    [email protected]
@@@ -14327,13 -14188,6 +14332,13 @@@ T: git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov02a10.yaml
  F:    drivers/media/i2c/ov02a10.c
  
 +OMNIVISION OV08D10 SENSOR DRIVER
 +M:    Jimmy Su <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/i2c/ov08d10.c
 +
  OMNIVISION OV13858 SENSOR DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
@@@ -14530,7 -14384,6 +14535,7 @@@ M:   Rob Herring <[email protected]
  M:    Frank Rowand <[email protected]>
  L:    [email protected]
  S:    Maintained
 +C:    irc://irc.libera.chat/devicetree
  W:    http://www.devicetree.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
  F:    Documentation/ABI/testing/sysfs-firmware-ofw
@@@ -14542,7 -14395,6 +14547,7 @@@ OPEN FIRMWARE AND FLATTENED DEVICE TRE
  M:    Rob Herring <[email protected]>
  L:    [email protected]
  S:    Maintained
 +C:    irc://irc.libera.chat/devicetree
  Q:    http://patchwork.ozlabs.org/project/devicetree-bindings/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
  F:    Documentation/devicetree/
@@@ -14729,9 -14581,8 +14734,9 @@@ F:   include/uapi/linux/ppdev.
  
  PARAVIRT_OPS INTERFACE
  M:    Juergen Gross <[email protected]>
 -M:    Deep Shah <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +M:    Srivatsa S. Bhat (VMware) <[email protected]>
 +R:    Alexey Makhalov <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -14938,7 -14789,6 +14943,7 @@@ F:   drivers/pci/controller/mobiveil/pcie
  
  PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
  M:    Thomas Petazzoni <[email protected]>
 +M:    Pali Rohár <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -15278,7 -15128,7 +15283,7 @@@ M:   Ingo Molnar <[email protected]
  M:    Arnaldo Carvalho de Melo <[email protected]>
  R:    Mark Rutland <[email protected]>
  R:    Alexander Shishkin <[email protected]>
 -R:    Jiri Olsa <jolsa@redhat.com>
 +R:    Jiri Olsa <jolsa@kernel.org>
  R:    Namhyung Kim <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -15433,16 -15283,14 +15438,16 @@@ F:        drivers/pinctrl/renesas
  
  PIN CONTROLLER - SAMSUNG
  M:    Tomasz Figa <[email protected]>
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
 +R:    Alim Akhtar <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 +C:    irc://irc.libera.chat/linux-exynos
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
 -F:    Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
 +F:    Documentation/devicetree/bindings/pinctrl/samsung,pinctrl*yaml
  F:    drivers/pinctrl/samsung/
  F:    include/dt-bindings/pinctrl/samsung.h
  
@@@ -15661,7 -15509,6 +15666,7 @@@ F:   drivers/net/ppp/pptp.
  
  PRESSURE STALL INFORMATION (PSI)
  M:    Johannes Weiner <[email protected]>
 +M:    Suren Baghdasaryan <[email protected]>
  S:    Maintained
  F:    include/linux/psi*
  F:    kernel/sched/psi.c
@@@ -15697,7 -15544,6 +15702,7 @@@ M:   Iurii Zaikin <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl-next
  F:    fs/proc/proc_sysctl.c
  F:    include/linux/sysctl.h
  F:    kernel/sysctl-test.c
@@@ -16045,20 -15891,18 +16050,20 @@@ 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
  
  QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
  M:    Kalle Valo <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 +F:    Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml
  F:    drivers/net/wireless/ath/ath11k/
  
  QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
 -M:    [email protected]
 +M:    Toke Høiland-Jørgensen <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
  F:    Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml
  F:    drivers/net/wireless/ath/ath9k/
@@@ -16133,6 -15977,14 +16138,6 @@@ F:  Documentation/devicetree/bindings/mi
  F:    drivers/misc/fastrpc.c
  F:    include/uapi/misc/fastrpc.h
  
 -QUALCOMM GENERIC INTERFACE I2C DRIVER
 -M:    Akash Asthana <[email protected]>
 -M:    Mukesh Savaliya <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/i2c/busses/i2c-qcom-geni.c
 -
  QUALCOMM HEXAGON ARCHITECTURE
  M:    Brian Cain <[email protected]>
  L:    [email protected]
@@@ -16204,8 -16056,8 +16209,8 @@@ F:   Documentation/devicetree/bindings/mt
  F:    drivers/mtd/nand/raw/qcom_nandc.c
  
  QUALCOMM RMNET DRIVER
 -M:    Subash Abhinov Kasiviswanathan <[email protected]>
 -M:    Sean Tranchetti <[email protected]>
 +M:    Subash Abhinov Kasiviswanathan <[email protected]>
 +M:    Sean Tranchetti <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/networking/device_drivers/cellular/qualcomm/rmnet.rst
@@@ -16231,10 -16083,11 +16236,10 @@@ F:        Documentation/devicetree/bindings/me
  F:    drivers/media/platform/qcom/venus/
  
  QUALCOMM WCN36XX WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@kernel.org>
 +M:    Loic Poulain <loic.poulain@linaro.org>
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wcn36xx
 -T:    git git://github.com/KrasnikovEugene/wcn36xx.git
  F:    drivers/net/wireless/ath/wcn36xx/
  
  QUANTENNA QTNFMAC WIRELESS DRIVER
@@@ -16336,7 -16189,6 +16341,7 @@@ M:   Jason A. Donenfeld <[email protected]
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git
  S:    Maintained
  F:    drivers/char/random.c
 +F:    drivers/virt/vmgenid.c
  
  RAPIDIO SUBSYSTEM
  M:    Matt Porter <[email protected]>
@@@ -16451,8 -16303,6 +16456,8 @@@ F:   tools/testing/selftests/resctrl
  
  READ-COPY UPDATE (RCU)
  M:    "Paul E. McKenney" <[email protected]>
 +M:    Frederic Weisbecker <[email protected]> (kernel/rcu/tree_nocb.h)
 +M:    Neeraj Upadhyay <[email protected]> (kernel/rcu/tasks.h)
  M:    Josh Triplett <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Mathieu Desnoyers <[email protected]>
@@@ -16500,10 -16350,10 +16505,10 @@@ F:        drivers/watchdog/realtek_otto_wdt.
  
  REALTEK RTL83xx SMI DSA ROUTER CHIPS
  M:    Linus Walleij <[email protected]>
 +M:    Alvin Šipraga <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
 -F:    drivers/net/dsa/realtek-smi*
 -F:    drivers/net/dsa/rtl83*
 +F:    Documentation/devicetree/bindings/net/dsa/realtek.yaml
 +F:    drivers/net/dsa/realtek/*
  
  REALTEK WIRELESS DRIVER (rtlwifi family)
  M:    Ping-Ke Shih <[email protected]>
@@@ -16619,14 -16469,6 +16624,14 @@@ F: Documentation/devicetree/bindings/i2
  F:    drivers/i2c/busses/i2c-rcar.c
  F:    drivers/i2c/busses/i2c-sh_mobile.c
  
 +RENESAS R-CAR SATA DRIVER
 +R:    Sergey Shtylyov <[email protected]>
 +S:    Supported
 +L:    [email protected]
 +L:    [email protected]
 +F:    Documentation/devicetree/bindings/ata/renesas,rcar-sata.yaml
 +F:    drivers/ata/sata_rcar.c
 +
  RENESAS R-CAR THERMAL DRIVERS
  M:    Niklas Söderlund <[email protected]>
  L:    [email protected]
@@@ -16695,9 -16537,8 +16700,9 @@@ M:   Johannes Berg <johannes@sipsolutions
  L:    [email protected]
  S:    Maintained
  W:    https://wireless.wiki.kernel.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 +Q:    https://patchwork.kernel.org/project/linux-wireless/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
  F:    Documentation/ABI/stable/sysfs-class-rfkill
  F:    Documentation/driver-api/rfkill.rst
  F:    include/linux/rfkill.h
@@@ -16725,15 -16566,6 +16730,15 @@@ S: Maintaine
  F:    drivers/mtd/nand/raw/r852.c
  F:    drivers/mtd/nand/raw/r852.h
  
 +RISC-V PMU DRIVERS
 +M:    Atish Patra <[email protected]>
 +R:    Anup Patel <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/perf/riscv_pmu.c
 +F:    drivers/perf/riscv_pmu_legacy.c
 +F:    drivers/perf/riscv_pmu_sbi.c
 +
  RISC-V ARCHITECTURE
  M:    Paul Walmsley <[email protected]>
  M:    Palmer Dabbelt <[email protected]>
@@@ -16748,10 -16580,8 +16753,10 @@@ K: risc
  
  RISC-V/MICROCHIP POLARFIRE SOC SUPPORT
  M:    Lewis Hanly <[email protected]>
 +M:    Conor Dooley <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    arch/riscv/boot/dts/microchip/
  F:    drivers/mailbox/mailbox-mpfs.c
  F:    drivers/soc/microchip/
  F:    include/soc/microchip/mpfs.h
@@@ -16779,7 -16609,8 +16784,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/rockchip/rockchip_i2s_tdm.*
  
  ROCKCHIP ISP V1 DRIVER
 -M:    Helen Koike <[email protected]>
 -M:    Dafna Hirschfeld <[email protected]>
 +M:    Dafna Hirschfeld <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -16972,8 -16803,8 +16977,8 @@@ F:   drivers/video/fbdev/savage
  S390
  M:    Heiko Carstens <[email protected]>
  M:    Vasily Gorbik <[email protected]>
 -M:    Christian Borntraeger <borntraeger@linux.ibm.com>
 -R:    Alexander Gordeev <agordeev@linux.ibm.com>
 +M:    Alexander Gordeev <agordeev@linux.ibm.com>
 +R:    Christian Borntraeger <borntraeger@linux.ibm.com>
  R:    Sven Schnelle <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -17048,7 -16879,9 +17053,7 @@@ L:   [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
  F:    Documentation/s390/vfio-ap.rst
 -F:    drivers/s390/crypto/vfio_ap_drv.c
 -F:    drivers/s390/crypto/vfio_ap_ops.c
 -F:    drivers/s390/crypto/vfio_ap_private.h
 +F:    drivers/s390/crypto/vfio_ap*
  
  S390 VFIO-CCW DRIVER
  M:    Eric Farman <[email protected]>
@@@ -17086,7 -16919,7 +17091,7 @@@ W:   http://www.ibm.com/developerworks/li
  F:    drivers/s390/scsi/zfcp_*
  
  S3C ADC BATTERY DRIVER
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  L:    [email protected]
  S:    Odd Fixes
  F:    drivers/power/supply/s3c_adc_battery.c
@@@ -17131,7 -16964,7 +17136,7 @@@ F:   Documentation/admin-guide/LSM/SafeSe
  F:    security/safesetid/
  
  SAMSUNG AUDIO (ASoC) DRIVERS
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -17139,7 -16972,7 +17144,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/samsung/
  
  SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -17174,7 -17007,7 +17179,7 @@@ S:   Maintaine
  F:    drivers/platform/x86/samsung-laptop.c
  
  SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -17196,11 -17029,11 +17201,11 @@@ M:        Sylwester Nawrocki <sylvester.nawroc
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/platform/s3c-camif/
 +F:    drivers/media/platform/samsung/s3c-camif/
  F:    include/media/drv-intf/s3c_camif.h
  
  SAMSUNG S3FWRN5 NFC DRIVER
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Krzysztof Opasiak <[email protected]>
  L:    [email protected] (subscribers-only)
  S:    Maintained
@@@ -17222,7 -17055,7 +17227,7 @@@ S:   Supporte
  F:    drivers/media/i2c/s5k5baf.c
  
  SAMSUNG S5P Security SubSystem (SSS) DRIVER
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Vladimir Zapolskiy <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -17236,13 -17069,12 +17241,13 @@@ M:        Sylwester Nawrocki <s.nawrocki@samsu
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.linuxtv.org/project/linux-media/list/
 -F:    drivers/media/platform/exynos4-is/
 +F:    drivers/media/platform/samsung/exynos4-is/
  
  SAMSUNG SOC CLOCK DRIVERS
  M:    Sylwester Nawrocki <[email protected]>
  M:    Tomasz Figa <[email protected]>
  M:    Chanwoo Choi <[email protected]>
 +R:    Alim Akhtar <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
@@@ -17257,12 -17089,12 +17262,12 @@@ F:        include/linux/clk/samsung.
  F:    include/linux/platform_data/clk-s3c2410.h
  
  SAMSUNG SPI DRIVERS
 -M:    Krzysztof Kozlowski <krz[email protected]>
 +M:    Krzysztof Kozlowski <krz[email protected]>
  M:    Andi Shyti <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/spi/spi-samsung.txt
 +F:    Documentation/devicetree/bindings/spi/samsung,spi*.yaml
  F:    drivers/spi/spi-s3c*
  F:    include/linux/platform_data/spi-s3c64xx.h
  F:    include/linux/spi/s3c24xx-fiq.h
@@@ -17274,12 -17106,11 +17279,12 @@@ S:        Supporte
  F:    drivers/net/ethernet/samsung/sxgbe/
  
  SAMSUNG THERMAL DRIVER
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
 +M:    Bartlomiej Zolnierkiewicz <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Supported
 -T:    git https://github.com/lmajewski/linux-samsung-thermal.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/thermal/samsung,exynos-thermal.yaml
  F:    drivers/thermal/samsung/
  
  SAMSUNG USB2 PHY DRIVER
@@@ -17671,7 -17502,7 +17676,7 @@@ F:   include/media/i2c/rj54n1cb0c.
  SH_VOU V4L2 OUTPUT DRIVER
  L:    [email protected]
  S:    Orphan
 -F:    drivers/media/platform/sh_vou.c
 +F:    drivers/media/platform/renesas/sh_vou.c
  F:    include/media/drv-intf/sh_vou.h
  
  SI2157 MEDIA DRIVER
@@@ -17880,21 -17711,6 +17885,21 @@@ S: Maintaine
  W:    http://www.winischhofer.at/linuxsisusbvga.shtml
  F:    drivers/usb/misc/sisusbvga/
  
 +SL28 CPLD MFD DRIVER
 +M:    Michael Walle <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/gpio/kontron,sl28cpld-gpio.yaml
 +F:    Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml
 +F:    Documentation/devicetree/bindings/interrupt-controller/kontron,sl28cpld-intc.yaml
 +F:    Documentation/devicetree/bindings/mfd/kontron,sl28cpld.yaml
 +F:    Documentation/devicetree/bindings/pwm/kontron,sl28cpld-pwm.yaml
 +F:    Documentation/devicetree/bindings/watchdog/kontron,sl28cpld-wdt.yaml
 +F:    drivers/gpio/gpio-sl28cpld.c
 +F:    drivers/hwmon/sl28cpld-hwmon.c
 +F:    drivers/irqchip/irq-sl28cpld.c
 +F:    drivers/pwm/pwm-sl28cpld.c
 +F:    drivers/watchdog/sl28cpld_wdt.c
 +
  SLAB ALLOCATOR
  M:    Christoph Lameter <[email protected]>
  M:    Pekka Enberg <[email protected]>
@@@ -17902,10 -17718,8 +17907,10 @@@ M: David Rientjes <[email protected]
  M:    Joonsoo Kim <[email protected]>
  M:    Andrew Morton <[email protected]>
  M:    Vlastimil Babka <[email protected]>
 +R:    Roman Gushchin <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
  F:    include/linux/sl?b*.h
  F:    mm/sl?b*
  
@@@ -18443,8 -18257,7 +18448,8 @@@ F:   Documentation/devicetree/bindings/ii
  F:    drivers/iio/imu/st_lsm6dsx/
  
  ST MIPID02 CSI-2 TO PARALLEL BRIDGE DRIVER
 -M:    Mickael Guene <[email protected]>
 +M:    Benjamin Mugnier <[email protected]>
 +M:    Sylvain Petinot <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -18614,7 -18427,7 +18619,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/sti/
  
  STI CEC DRIVER
 -M:    Benjamin Gaignard <[email protected]>
 +M:    Alain Volmat <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/stih-cec.txt
  F:    drivers/media/cec/platform/sti/
@@@ -18683,13 -18496,6 +18688,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/rtc/sunplus,sp7021-rtc.yaml
  F:    drivers/rtc/rtc-sunplus.c
  
 +SUNPLUS SPI CONTROLLER INTERFACE DRIVER
 +M:    Li-hao Kuo <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/spi-sunplus-sp7021.yaml
 +F:    drivers/spi/spi-sunplus-sp7021.c
 +
  SUPERH
  M:    Yoshinori Sato <[email protected]>
  M:    Rich Felker <[email protected]>
@@@ -19241,7 -19047,6 +19246,7 @@@ TEXAS INSTRUMENTS ASoC DRIVER
  M:    Peter Ujfalusi <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
  F:    sound/soc/ti/
  
  TEXAS INSTRUMENTS' DAC7612 DAC DRIVER
@@@ -19422,7 -19227,7 +19427,7 @@@ S:   Maintaine
  W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 -F:    drivers/media/platform/am437x/
 +F:    drivers/media/platform/ti/am437x/
  
  TI BANDGAP AND THERMAL DRIVER
  M:    Eduardo Valentin <[email protected]>
@@@ -19481,7 -19286,7 +19486,7 @@@ S:   Maintaine
  W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 -F:    drivers/media/platform/davinci/
 +F:    drivers/media/platform/ti/davinci/
  F:    include/media/davinci/
  
  TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER
@@@ -19567,8 -19372,7 +19572,8 @@@ W:   http://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  F:    Documentation/devicetree/bindings/media/ti,cal.yaml
  F:    Documentation/devicetree/bindings/media/ti,vpe.yaml
 -F:    drivers/media/platform/ti-vpe/
 +F:    drivers/media/platform/ti/cal/
 +F:    drivers/media/platform/ti/vpe/
  
  TI WILINK WIRELESS DRIVERS
  L:    [email protected]
@@@ -19639,15 -19443,6 +19644,15 @@@ S: Maintaine
  F:    Documentation/hwmon/tmp401.rst
  F:    drivers/hwmon/tmp401.c
  
 +TMP464 HARDWARE MONITOR DRIVER
 +M:    Agathe Porte <[email protected]>
 +M:    Guenter Roeck <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml
 +F:    Documentation/hwmon/tmp464.rst
 +F:    drivers/hwmon/tmp464.c
 +
  TMP513 HARDWARE MONITOR DRIVER
  M:    Eric Tremblay <[email protected]>
  L:    [email protected]
@@@ -19786,14 -19581,6 +19791,14 @@@ F: Documentation/trace/timerlat-tracer.
  F:    Documentation/trace/hwlat_detector.rst
  F:    arch/*/kernel/trace.c
  
 +Real-time Linux Analysis (RTLA) tools
 +M:    Daniel Bristot de Oliveira <[email protected]>
 +M:    Steven Rostedt <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/tools/rtla/
 +F:    tools/tracing/rtla/
 +
  TRADITIONAL CHINESE DOCUMENTATION
  M:    Hu Haowen <[email protected]>
  L:    [email protected]
@@@ -20463,13 -20250,6 +20468,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/vfio/fsl-mc/
  
 +VFIO HISILICON PCI DRIVER
 +M:    Longfang Liu <[email protected]>
 +M:    Shameer Kolothum <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/vfio/pci/hisilicon/
 +
  VFIO MEDIATED DEVICE DRIVERS
  M:    Kirti Wankhede <[email protected]>
  L:    [email protected]
@@@ -20479,28 -20259,12 +20484,28 @@@ F:        drivers/vfio/mdev
  F:    include/linux/mdev.h
  F:    samples/vfio-mdev/
  
 +VFIO PCI DEVICE SPECIFIC DRIVERS
 +R:    Jason Gunthorpe <[email protected]>
 +R:    Yishai Hadas <[email protected]>
 +R:    Shameer Kolothum <[email protected]>
 +R:    Kevin Tian <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +P:    Documentation/driver-api/vfio-pci-device-specific-driver-acceptance.rst
 +F:    drivers/vfio/pci/*/
 +
  VFIO PLATFORM DRIVER
  M:    Eric Auger <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/vfio/platform/
  
 +VFIO MLX5 PCI DRIVER
 +M:    Yishai Hadas <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/vfio/pci/mlx5/
 +
  VGA_SWITCHEROO
  R:    Lukas Wunner <[email protected]>
  S:    Maintained
@@@ -20564,8 -20328,8 +20569,8 @@@ F:   drivers/media/common/videobuf2/
  F:    include/media/videobuf2-*
  
  VIMC VIRTUAL MEDIA CONTROLLER DRIVER
 -M:    Helen Koike <[email protected]>
 -R:    Shuah Khan <[email protected]>
 +M:    Shuah Khan <[email protected]>
 +R:    Kieran Bingham <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
@@@ -20820,33 -20584,30 +20825,33 @@@ F:        tools/testing/vsock
  
  VMWARE BALLOON DRIVER
  M:    Nadav Amit <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/misc/vmw_balloon.c
  
  VMWARE HYPERVISOR INTERFACE
 -M:    Deep Shah <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +M:    Srivatsa S. Bhat (VMware) <[email protected]>
 +M:    Alexey Makhalov <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vmware
  F:    arch/x86/include/asm/vmware.h
  F:    arch/x86/kernel/cpu/vmware.c
  
  VMWARE PVRDMA DRIVER
  M:    Bryan Tan <[email protected]>
  M:    Vishnu Dasa <[email protected]>
 -M:    VMware PV-Drivers <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/infiniband/hw/vmw_pvrdma/
  
  VMware PVSCSI driver
  M:    Vishal Bhakta <[email protected]>
 -M:    VMware PV-Drivers <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/scsi/vmw_pvscsi.c
@@@ -20854,7 -20615,7 +20859,7 @@@ F:   drivers/scsi/vmw_pvscsi.
  
  VMWARE VIRTUAL PTP CLOCK DRIVER
  M:    Vivek Thampi <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/ptp/ptp_vmw.c
@@@ -20862,15 -20623,14 +20867,15 @@@
  VMWARE VMCI DRIVER
  M:    Jorgen Hansen <[email protected]>
  M:    Vishnu Dasa <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
 -L:    [email protected] (private)
  S:    Maintained
  F:    drivers/misc/vmw_vmci/
  
  VMWARE VMMOUSE SUBDRIVER
 -M:    "VMware Graphics" <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +M:    Zack Rusin <[email protected]>
 +R:    VMware Graphics Reviewers <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/input/mouse/vmmouse.c
@@@ -20878,7 -20638,7 +20883,7 @@@ F:   drivers/input/mouse/vmmouse.
  
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Ronak Doshi <[email protected]>
 -M:    [email protected]
 +R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/vmxnet3/
@@@ -21254,7 -21014,7 +21259,7 @@@ L:   [email protected]
  S:    Maintained
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/tuners/tuner-xc2028.*
 +F:    drivers/media/tuners/xc2028.*
  
  XDP (eXpress Data Path)
  M:    Alexei Starovoitov <[email protected]>
@@@ -21474,11 -21234,6 +21479,11 @@@ T: git https://github.com/Xilinx/linux-
  F:    Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml
  F:    drivers/phy/xilinx/phy-zynqmp.c
  
 +XILINX ZYNQMP SHA3 DRIVER
 +M:    Harsha <[email protected]>
 +S:    Maintained
 +F:    drivers/crypto/xilinx/zynqmp-sha.c
 +
  XILINX EVENT MANAGEMENT DRIVER
  M:    Abhyuday Godhasara <[email protected]>
  S:    Maintained
@@@ -21659,6 -21414,7 +21664,6 @@@ THE RES
  M:    Linus Torvalds <[email protected]>
  L:    [email protected]
  S:    Buried alive in reporters
 -Q:    http://patchwork.kernel.org/project/LKML/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
  F:    *
  F:    */

diff --combined include/linux/platform_data/cros_ec_commands.h
index 728735aed980b1cd85c001d690ef014c1e46d8ef,95e7e5667291b78d812cb742325d6bd82206edb5..c23554531961c3bd2ec984fbc20274ba41fa3278
--- 1/include/linux/platform_data/cros_ec_commands.h
--- 2/include/linux/platform_data/cros_ec_commands.h
+++ b/include/linux/platform_data/cros_ec_commands.h
@@@ -3386,6 -3386,9 +3386,9 @@@ enum ec_mkbp_event 
        /* Send an incoming CEC message to the AP */
        EC_MKBP_EVENT_CEC_MESSAGE = 9,
  
+       /* Peripheral device charger event */
+       EC_MKBP_EVENT_PCHG = 12,
+ 
        /* Number of MKBP events */
        EC_MKBP_EVENT_COUNT,
  };
@@@ -5527,6 -5530,67 +5530,67 @@@ enum pchg_state 
        [PCHG_STATE_CONNECTED] = "CONNECTED", \
        }
  
+ /*
+  * Update firmware of peripheral chip
+  */
+ #define EC_CMD_PCHG_UPDATE 0x0136
+ 
+ /* Port number is encoded in bit[28:31]. */
+ #define EC_MKBP_PCHG_PORT_SHIFT               28
+ /* Utility macro for converting MKBP event to port number. */
+ #define EC_MKBP_PCHG_EVENT_TO_PORT(e) (((e) >> EC_MKBP_PCHG_PORT_SHIFT) & 0xf)
+ /* Utility macro for extracting event bits. */
+ #define EC_MKBP_PCHG_EVENT_MASK(e)    ((e) \
+                                       & GENMASK(EC_MKBP_PCHG_PORT_SHIFT-1, 0))
+ 
+ #define EC_MKBP_PCHG_UPDATE_OPENED    BIT(0)
+ #define EC_MKBP_PCHG_WRITE_COMPLETE   BIT(1)
+ #define EC_MKBP_PCHG_UPDATE_CLOSED    BIT(2)
+ #define EC_MKBP_PCHG_UPDATE_ERROR     BIT(3)
+ #define EC_MKBP_PCHG_DEVICE_EVENT     BIT(4)
+ 
+ enum ec_pchg_update_cmd {
+       /* Reset chip to normal mode. */
+       EC_PCHG_UPDATE_CMD_RESET_TO_NORMAL = 0,
+       /* Reset and put a chip in update (a.k.a. download) mode. */
+       EC_PCHG_UPDATE_CMD_OPEN,
+       /* Write a block of data containing FW image. */
+       EC_PCHG_UPDATE_CMD_WRITE,
+       /* Close update session. */
+       EC_PCHG_UPDATE_CMD_CLOSE,
+       /* End of commands */
+       EC_PCHG_UPDATE_CMD_COUNT,
+ };
+ 
+ struct ec_params_pchg_update {
+       /* PCHG port number */
+       uint8_t port;
+       /* enum ec_pchg_update_cmd */
+       uint8_t cmd;
+       /* Padding */
+       uint8_t reserved0;
+       uint8_t reserved1;
+       /* Version of new firmware */
+       uint32_t version;
+       /* CRC32 of new firmware */
+       uint32_t crc32;
+       /* Address in chip memory where <data> is written to */
+       uint32_t addr;
+       /* Size of <data> */
+       uint32_t size;
+       /* Partial data of new firmware */
+       uint8_t data[];
+ } __ec_align4;
+ 
+ BUILD_ASSERT(EC_PCHG_UPDATE_CMD_COUNT
+            < BIT(sizeof(((struct ec_params_pchg_update *)0)->cmd)*8));
+ 
+ struct ec_response_pchg_update {
+       /* Block size */
+       uint32_t block_size;
+ } __ec_align4;
+ 
+ 
  /*****************************************************************************/
  /* Voltage regulator controls */
  
@@@ -5644,7 -5708,7 +5708,7 @@@ struct ec_response_typec_discovery 
        uint8_t svid_count;        /* Number of SVIDs partner sent */
        uint16_t reserved;
        uint32_t discovery_vdo[6]; /* Max VDOs allowed after VDM header is 6 */
 -      struct svid_mode_info svids[0];
 +      struct svid_mode_info svids[];
  } __ec_align1;
  
  /* USB Type-C commands for AP-controlled device policy. */