Merge tag 'devicetree-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git...

author Linus Torvalds <torvalds@linux-foundation.org>

Thu, 2 Sep 2021 01:34:51 +0000 (18:34 -0700)

committer Linus Torvalds <torvalds@linux-foundation.org>

Thu, 2 Sep 2021 01:34:51 +0000 (18:34 -0700)
author Linus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Sep 2021 01:34:51 +0000 (18:34 -0700)
committer Linus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Sep 2021 01:34:51 +0000 (18:34 -0700)
diff --combined Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml

index 760eec6,de23cab..35426fd
--- 1/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml
--- 2/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml
+++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml
@@@ -64,18 -64,6 +64,18 @@@ properties
         Indicates if the DSI controller is driving a panel which needs
         2 DSI links.
   
+ +  assigned-clocks:
+ +    minItems: 2
+ +    maxItems: 2
+ +    description: |
+ +      Parents of "byte" and "pixel" for the given platform.
+ +
+ +  assigned-clock-parents:
+ +    minItems: 2
+ +    maxItems: 2
+ +    description: |
+ +      The Byte clock and Pixel clock PLL outputs provided by a DSI PHY block.
+ +
     power-domains:
       maxItems: 1
   
@@@ -89,7 -77,8 +89,8 @@@
   
       properties:
         port@0:
-         $ref: "/schemas/graph.yaml#/properties/port"
+         $ref: "/schemas/graph.yaml#/$defs/port-base"
+         unevaluatedProperties: false
           description: |
             Input endpoints of the controller.
           properties:
@@@ -104,7 -93,8 +105,8 @@@
                     enum: [ 0, 1, 2, 3 ]
   
         port@1:
-         $ref: "/schemas/graph.yaml#/properties/port"
+         $ref: "/schemas/graph.yaml#/$defs/port-base"
+         unevaluatedProperties: false
           description: |
             Output endpoints of the controller.
           properties:
@@@ -131,8 -121,6 +133,8 @@@ required
     - clock-names
     - phys
     - phy-names
+ +  - assigned-clocks
+ +  - assigned-clock-parents
     - power-domains
     - operating-points-v2
     - ports
@@@ -173,9 -161,6 +175,9 @@@ examples
              phys = <&dsi0_phy>;
              phy-names = "dsi";
   
+ +           assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>;
+ +           assigned-clock-parents = <&dsi_phy 0>, <&dsi_phy 1>;
+ +
              power-domains = <&rpmhpd SC7180_CX>;
              operating-points-v2 = <&dsi_opp_table>;
   
diff --combined Documentation/devicetree/bindings/serial/8250_omap.yaml

index ab0c0fe,c987fb6..70ca616
--- 1/Documentation/devicetree/bindings/serial/8250_omap.yaml
--- 2/Documentation/devicetree/bindings/serial/8250_omap.yaml
+++ b/Documentation/devicetree/bindings/serial/8250_omap.yaml
@@@ -79,7 -79,6 +79,7 @@@ properties
     power-domains: true
     clock-frequency: true
     current-speed: true
+ +  overrun-throttle-ms: true
   
   required:
     - compatible
@@@ -91,10 -90,11 +91,11 @@@ additionalProperties: fals
   if:
     properties:
       compatible:
-       oneOf:
-         - const: ti,omap2-uart
-         - const: ti,omap3-uart
-         - const: ti,omap4-uart
+       contains:
+         enum:
+           - ti,omap2-uart
+           - ti,omap3-uart
+           - ti,omap4-uart
   
   then:
     properties:
diff --combined Documentation/devicetree/bindings/trivial-devices.yaml

index fb03feb,5a83380..1e4b346
--- 1/Documentation/devicetree/bindings/trivial-devices.yaml
--- 2/Documentation/devicetree/bindings/trivial-devices.yaml
+++ b/Documentation/devicetree/bindings/trivial-devices.yaml
@@@ -33,8 -33,6 +33,8 @@@ properties
             - ad,ad7414
               # ADM9240:  Complete System Hardware Monitor for uProcessor-Based Systems
             - ad,adm9240
+ +            # AD5110 - Nonvolatile Digital Potentiometer
+ +          - adi,ad5110
               # Analog Devices ADP5585 Keypad Decoder and I/O Expansion
             - adi,adp5585
               # Analog Devices ADP5585 Keypad Decoder and I/O Expansion with support for Row5
@@@ -63,8 -61,6 +63,8 @@@
             - capella,cm32181
               # CM3232: Ambient Light Sensor
             - capella,cm3232
+ +            # CM3323: Ambient Light Sensor
+ +          - capella,cm3323
               # High-Precision Digital Thermometer
             - dallas,ds1631
               # Total-Elapsed-Time Recorder with Alarm
@@@ -147,6 -143,8 +147,8 @@@
             - maxim,ds1803-100
               # Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs
             - maxim,max1237
+             # Temperature Sensor, I2C interface
+           - maxim,max1619
               # 10-bit 10 kOhm linear programable voltage divider
             - maxim,max5481
               # 10-bit 50 kOhm linear programable voltage divider
@@@ -273,8 -271,6 +275,8 @@@
             - sensirion,sgpc3
               # Sensirion multi-pixel gas sensor with I2C interface
             - sensirion,sgp30
+ +            # Sensirion gas sensor with I2C interface
+ +          - sensirion,sgp40
               # Sensortek 3 axis accelerometer
             - sensortek,stk8312
               # Sensortek 3 axis accelerometer
diff --combined Documentation/devicetree/bindings/vendor-prefixes.yaml

index 749302f,c90c0ea..a867f71
--- 1/Documentation/devicetree/bindings/vendor-prefixes.yaml
--- 2/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -271,8 -271,6 +271,8 @@@ patternProperties
       description: Shenzen Chuangsiqi Technology Co.,Ltd.
     "^cubietech,.*":
       description: Cubietech, Ltd.
+ +  "^cui,.*":
+ +    description: CUI Devices
     "^cypress,.*":
       description: Cypress Semiconductor Corporation
     "^cznic,.*":
@@@ -341,8 -339,6 +341,8 @@@
       description: eGalax_eMPIA Technology Inc
     "^einfochips,.*":
       description: Einfochips
+ +  "^eink,.*":
+ +    description: E Ink Corporation
     "^elan,.*":
       description: Elan Microelectronic Corp.
     "^element14,.*":
@@@ -567,6 -563,8 +567,8 @@@
       description: ITE Tech. Inc.
     "^itead,.*":
       description: ITEAD Intelligent Systems Co.Ltd
+   "^itian,.*":
+     description: ITian Corporation
     "^iwave,.*":
       description: iWave Systems Technologies Pvt. Ltd.
     "^jdi,.*":
@@@ -739,8 -737,6 +741,8 @@@
       description: MiraMEMS Sensing Technology Co., Ltd.
     "^mitsubishi,.*":
       description: Mitsubishi Electric Corporation
+ +  "^mntre,.*":
+ +    description: MNT Research GmbH
     "^modtronix,.*":
       description: Modtronix Engineering
     "^mosaixtech,.*":
@@@ -942,8 -938,6 +944,8 @@@
       description: Chengdu Kaixuan Information Technology Co., Ltd.
     "^qiaodian,.*":
       description: QiaoDian XianShi Corporation
+ +  "^qishenglong,.*":
+ +    description: Shenzhen QiShenglong Industrialist Co., Ltd.
     "^qnap,.*":
       description: QNAP Systems, Inc.
     "^radxa,.*":
@@@ -1074,8 -1068,6 +1076,8 @@@
       description: Silicon Integrated Systems Corp.
     "^sitronix,.*":
       description: Sitronix Technology Corporation
+ +  "^skov,.*":
+ +    description: SKOV A/S
     "^skyworks,.*":
       description: Skyworks Solutions, Inc.
     "^smartlabs,.*":
@@@ -1121,6 -1113,10 +1123,10 @@@
     "^st-ericsson,.*":
       description: ST-Ericsson
       deprecated: true
+   "^storlink,.*":
+     description: StorLink Semiconductors, Inc.
+   "^storm,.*":
+     description: Storm Semiconductor, Inc.
     "^summit,.*":
       description: Summit microelectronics
     "^sunchip,.*":
@@@ -1153,6 -1149,8 +1159,8 @@@
       description: TechNexion
     "^technologic,.*":
       description: Technologic Systems
+   "^teltonika,.*":
+     description: Teltonika Networks
     "^tempo,.*":
       description: Tempo Semiconductor
     "^techstar,.*":
@@@ -1175,6 -1173,8 +1183,8 @@@
       description: Tecon Microprocessor Technologies, LLC.
     "^topeet,.*":
       description: Topeet
+   "^topic,.*":
+     description: Topic Embedded Systems
     "^toppoly,.*":
       description: TPO (deprecated, use tpo)
       deprecated: true
@@@ -1194,8 -1194,6 +1204,8 @@@
       description: TPO
     "^tq,.*":
       description: TQ-Systems GmbH
+ +  "^traverse,.*":
+ +    description: Traverse Technologies Australia Pty Ltd
     "^tronfy,.*":
       description: Tronfy
     "^tronsmart,.*":
@@@ -1280,6 -1278,8 +1290,8 @@@
       description: Shenzhen whwave Electronics, Inc.
     "^wi2wi,.*":
       description: Wi2Wi, Inc.
+   "^wiligear,.*":
+     description: Wiligear, Ltd.
     "^winbond,.*":
       description: Winbond Electronics corp.
     "^winstar,.*":
diff --combined MAINTAINERS

index 7c2fe5f,fb31af5..63bddf7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -445,7 -445,7 +445,7 @@@ F: drivers/platform/x86/wmi.
   F:    include/uapi/linux/wmi.h
   
   ACRN HYPERVISOR SERVICE MODULE
- -M:    Shuo Liu <shuo.a.liu@intel.com>
+ +M:    Fei Li <fei1.li@intel.com>
   L:    acrn-dev@lists.projectacrn.org (subscribers-only)
   S:    Supported
   W:    https://projectacrn.org
@@@ -459,12 -459,6 +459,12 @@@ S:       Maintaine
   W:    https://parisc.wiki.kernel.org/index.php/AD1889
   F:    sound/pci/ad1889.*
   
+ +AD5110 ANALOG DEVICES DIGITAL POTENTIOMETERS DRIVER
+ +M:    Mugilraj Dhavachelvan <dmugil2000@gmail.com>
+ +L:    linux-iio@vger.kernel.org
+ +S:    Supported
+ +F:    drivers/iio/potentiometer/ad5110.c
+ +
   AD525X ANALOG DEVICES DIGITAL POTENTIOMETERS DRIVER
   M:    Michael Hennerich <michael.hennerich@analog.com>
   S:    Supported
@@@ -939,7 -933,6 +939,7 @@@ F: drivers/video/fbdev/geode
   
   AMD IOMMU (AMD-VI)
   M:    Joerg Roedel <joro@8bytes.org>
+ +R:    Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
   L:    iommu@lists.linux-foundation.org
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@@ -1322,13 -1315,6 +1322,13 @@@ L:    linux-media@vger.kernel.or
   S:    Maintained
   F:    drivers/media/i2c/aptina-pll.*
   
+ +AQUACOMPUTER D5 NEXT PUMP SENSOR DRIVER
+ +M:    Aleksa Savic <savicaleksa83@gmail.com>
+ +L:    linux-hwmon@vger.kernel.org
+ +S:    Maintained
+ +F:    Documentation/hwmon/aquacomputer_d5next.rst
+ +F:    drivers/hwmon/aquacomputer_d5next.c
+ +
   AQUANTIA ETHERNET DRIVER (atlantic)
   M:    Igor Russkikh <irusskikh@marvell.com>
   L:    netdev@vger.kernel.org
@@@ -1395,7 -1381,7 +1395,7 @@@ F:      Documentation/devicetree/bindings/ar
   F:    Documentation/devicetree/bindings/arm/arm,realview.yaml
   F:    Documentation/devicetree/bindings/arm/arm,versatile.yaml
   F:    Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml
- F:    Documentation/devicetree/bindings/auxdisplay/arm-charlcd.txt
+ F:    Documentation/devicetree/bindings/auxdisplay/arm,versatile-lcd.yaml
   F:    Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml
   F:    Documentation/devicetree/bindings/i2c/i2c-versatile.txt
   F:    Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt
@@@ -1501,7 -1487,7 +1501,7 @@@ M:      Miquel Raynal <miquel.raynal@bootlin
   M:    Naga Sureshkumar Relli <nagasure@xilinx.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
- -F:    Documentation/devicetree/bindings/mtd/arm,pl353-smc.yaml
+ +F:    Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml
   F:    drivers/memory/pl353-smc.c
   
   ARM PRIMECELL CLCD PL110 DRIVER
@@@ -1703,7 -1689,7 +1703,7 @@@ L:      linux-arm-kernel@lists.infradead.or
   S:    Maintained
   W:    https://asahilinux.org
   B:    https://github.com/AsahiLinux/linux/issues
- -C:    irc://chat.freenode.net/asahi-dev
+ +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/interrupt-controller/apple,aic.yaml
@@@ -2023,12 -2009,10 +2023,12 @@@ M:   Krzysztof Halasa <khalasa@piap.pl
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
   F:    Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
+ +F:    Documentation/devicetree/bindings/bus/intel,ixp4xx-expansion-bus-controller.yaml
   F:    Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt
   F:    Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
   F:    Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
   F:    arch/arm/mach-ixp4xx/
+ +F:    drivers/bus/intel-ixp4xx-eb.c
   F:    drivers/clocksource/timer-ixp4xx.c
   F:    drivers/crypto/ixp4xx_crypto.c
   F:    drivers/gpio/gpio-ixp4xx.c
@@@ -2857,7 -2841,7 +2857,7 @@@ AS3645A LED FLASH CONTROLLER DRIVE
   M:    Sakari Ailus <sakari.ailus@iki.fi>
   L:    linux-leds@vger.kernel.org
   S:    Maintained
- -F:    drivers/leds/leds-as3645a.c
+ +F:    drivers/leds/flash/leds-as3645a.c
   
   ASAHI KASEI AK7375 LENS VOICE COIL DRIVER
   M:    Tianshu Qiu <tian.shu.qiu@intel.com>
@@@ -3212,7 -3196,7 +3212,7 @@@ S:      Maintaine
   W:    https://www.open-mesh.org/
   Q:    https://patchwork.open-mesh.org/project/batman/list/
   B:    https://www.open-mesh.org/projects/batman-adv/issues
- -C:    irc://chat.freenode.net/batman
+ +C:    ircs://irc.hackint.org/batadv
   T:    git https://git.open-mesh.org/linux-merge.git
   F:    Documentation/networking/batman-adv.rst
   F:    include/uapi/linux/batadv_packet.h
@@@ -3424,6 -3408,7 +3424,6 @@@ F:      drivers/net/ethernet/netronome/nfp/b
   
   BPF JIT for POWERPC (32-BIT AND 64-BIT)
   M:    Naveen N. Rao <naveen.n.rao@linux.ibm.com>
- -M:    Sandipan Das <sandipan@linux.ibm.com>
   L:    netdev@vger.kernel.org
   L:    bpf@vger.kernel.org
   S:    Maintained
@@@ -3869,7 -3854,7 +3869,7 @@@ M:      Markus Mayer <mmayer@broadcom.com
   M:    bcm-kernel-feedback-list@broadcom.com
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
- F:    Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt
+ F:    Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml
   F:    drivers/memory/brcmstb_dpfe.c
   
   BROADCOM STB NAND FLASH DRIVER
@@@ -3880,16 -3865,6 +3880,16 @@@ L:    bcm-kernel-feedback-list@broadcom.co
   S:    Maintained
   F:    drivers/mtd/nand/raw/brcmnand/
   
+ +BROADCOM STB PCIE DRIVER
+ +M:    Jim Quinlan <jim2101024@gmail.com>
+ +M:    Nicolas Saenz Julienne <nsaenz@kernel.org>
+ +M:    Florian Fainelli <f.fainelli@gmail.com>
+ +M:    bcm-kernel-feedback-list@broadcom.com
+ +L:    linux-pci@vger.kernel.org
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
+ +F:    drivers/pci/controller/pcie-brcmstb.c
+ +
   BROADCOM SYSTEMPORT ETHERNET DRIVER
   M:    Florian Fainelli <f.fainelli@gmail.com>
   L:    bcm-kernel-feedback-list@broadcom.com
@@@ -4522,7 -4497,7 +4522,7 @@@ L:      clang-built-linux@googlegroups.co
   S:    Supported
   W:    https://clangbuiltlinux.github.io/
   B:    https://github.com/ClangBuiltLinux/linux/issues
- -C:    irc://chat.freenode.net/clangbuiltlinux
+ +C:    irc://irc.libera.chat/clangbuiltlinux
   F:    Documentation/kbuild/llvm.rst
   F:    include/linux/compiler-clang.h
   F:    scripts/clang-tools/
@@@ -4634,7 -4609,7 +4634,7 @@@ F:      include/linux/clk
   F:    include/linux/of_clk.h
   X:    drivers/clk/clkdev.c
   
- -COMMON INTERNET FILE SYSTEM (CIFS)
+ +COMMON INTERNET FILE SYSTEM CLIENT (CIFS)
   M:    Steve French <sfrench@samba.org>
   L:    linux-cifs@vger.kernel.org
   L:    samba-technical@lists.samba.org (moderated for non-subscribers)
@@@ -4643,7 -4618,6 +4643,7 @@@ W:      http://linux-cifs.samba.org
   T:    git git://git.samba.org/sfrench/cifs-2.6.git
   F:    Documentation/admin-guide/cifs/
   F:    fs/cifs/
+ +F:    fs/cifs_common/
   
   COMPACTPCI HOTPLUG CORE
   M:    Scott Murray <scott@spiteful.org>
@@@ -5595,7 -5569,7 +5595,7 @@@ M:      Lukasz Luba <lukasz.luba@arm.com
   L:    linux-pm@vger.kernel.org
   L:    linux-samsung-soc@vger.kernel.org
   S:    Maintained
- F:    Documentation/devicetree/bindings/memory-controllers/exynos5422-dmc.txt
+ F:    Documentation/devicetree/bindings/memory-controllers/samsung,exynos5422-dmc.yaml
   F:    drivers/memory/samsung/exynos5422-dmc.c
   
   DME1737 HARDWARE MONITOR DRIVER
@@@ -5709,7 -5683,6 +5709,7 @@@ DPAA2 ETHERNET SWITCH DRIVE
   M:    Ioana Ciornei <ioana.ciornei@nxp.com>
   L:    netdev@vger.kernel.org
   S:    Maintained
+ +F:    Documentation/networking/device_drivers/ethernet/freescale/dpaa2/switch-driver.rst
   F:    drivers/net/ethernet/freescale/dpaa2/dpaa2-switch*
   F:    drivers/net/ethernet/freescale/dpaa2/dpsw*
   
@@@ -5733,11 -5706,6 +5733,11 @@@ F:    Documentation/admin-guide/blockdev
   F:    drivers/block/drbd/
   F:    lib/lru_cache.c
   
+ +DRIVER COMPONENT FRAMEWORK
+ +L:    dri-devel@lists.freedesktop.org
+ +F:    drivers/base/component.c
+ +F:    include/linux/component.h
+ +
   DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
   M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   R:    "Rafael J. Wysocki" <rafael@kernel.org>
@@@ -5801,7 -5769,7 +5801,7 @@@ M:      Gerd Hoffmann <kraxel@redhat.com
   L:    virtualization@lists.linux-foundation.org
   S:    Maintained
   T:    git git://anongit.freedesktop.org/drm/drm-misc
- -F:    drivers/gpu/drm/bochs/
+ +F:    drivers/gpu/drm/tiny/bochs.c
   
   DRM DRIVER FOR BOE HIMAX8279D PANELS
   M:    Jerry Han <hanxu5@huaqin.corp-partner.google.com>
@@@ -5986,13 -5954,6 +5986,13 @@@ S:    Maintaine
   F:    Documentation/devicetree/bindings/display/panel/raydium,rm67191.yaml
   F:    drivers/gpu/drm/panel/panel-raydium-rm67191.c
   
+ +DRM DRIVER FOR SAMSUNG DB7430 PANELS
+ +M:    Linus Walleij <linus.walleij@linaro.org>
+ +S:    Maintained
+ +T:    git git://anongit.freedesktop.org/drm/drm-misc
+ +F:    Documentation/devicetree/bindings/display/panel/samsung,lms397kf04.yaml
+ +F:    drivers/gpu/drm/panel/panel-samsung-db7430.c
+ +
   DRM DRIVER FOR SITRONIX ST7703 PANELS
   M:    Guido Günther <agx@sigxcpu.org>
   R:    Purism Kernel Team <kernel@puri.sm>
@@@ -6091,27 -6052,21 +6091,27 @@@ F:   drivers/gpu/drm/vboxvideo
   
   DRM DRIVER FOR VMWARE VIRTUAL GPU
   M:    "VMware Graphics" <linux-graphics-maintainer@vmware.com>
- -M:    Roland Scheidegger <sroland@vmware.com>
   M:    Zack Rusin <zackr@vmware.com>
   L:    dri-devel@lists.freedesktop.org
   S:    Supported
- -T:    git git://people.freedesktop.org/~sroland/linux
+ +T:    git git://anongit.freedesktop.org/drm/drm-misc
   F:    drivers/gpu/drm/vmwgfx/
   F:    include/uapi/drm/vmwgfx_drm.h
   
+ +DRM DRIVER FOR WIDECHIPS WS2401 PANELS
+ +M:    Linus Walleij <linus.walleij@linaro.org>
+ +S:    Maintained
+ +T:    git git://anongit.freedesktop.org/drm/drm-misc
+ +F:    Documentation/devicetree/bindings/display/panel/samsung,lms380kf01.yaml
+ +F:    drivers/gpu/drm/panel/panel-widechips-ws2401.c
+ +
   DRM DRIVERS
   M:    David Airlie <airlied@linux.ie>
   M:    Daniel Vetter <daniel@ffwll.ch>
   L:    dri-devel@lists.freedesktop.org
   S:    Maintained
   B:    https://gitlab.freedesktop.org/drm
- -C:    irc://chat.freenode.net/dri-devel
+ +C:    irc://irc.oftc.net/dri-devel
   T:    git git://anongit.freedesktop.org/drm/drm
   F:    Documentation/devicetree/bindings/display/
   F:    Documentation/devicetree/bindings/gpu/
@@@ -6604,6 -6559,7 +6604,7 @@@ EDAC-ARMAD
   M:    Jan Luebbe <jlu@pengutronix.de>
   L:    linux-edac@vger.kernel.org
   S:    Maintained
+ F:    Documentation/devicetree/bindings/memory-controllers/marvell,mvebu-sdram-controller.yaml
   F:    drivers/edac/armada_xp_*
   
   EDAC-AST2500
@@@ -6948,12 -6904,6 +6949,12 @@@ M:    Mark Einon <mark.einon@gmail.com
   S:    Odd Fixes
   F:    drivers/net/ethernet/agere/
   
+ +ETAS ES58X CAN/USB DRIVER
+ +M:    Vincent Mailhol <mailhol.vincent@wanadoo.fr>
+ +L:    linux-can@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/net/can/usb/etas_es58x/
+ +
   ETHERNET BRIDGE
   M:    Roopa Prabhu <roopa@nvidia.com>
   M:    Nikolay Aleksandrov <nikolay@nvidia.com>
@@@ -6995,7 -6945,7 +6996,7 @@@ F:      include/uapi/linux/mdio.
   F:    include/uapi/linux/mii.h
   
   EXFAT FILE SYSTEM
- -M:    Namjae Jeon <namjae.jeon@samsung.com>
+ +M:    Namjae Jeon <linkinjeon@kernel.org>
   M:    Sungjong Seo <sj1557.seo@samsung.com>
   L:    linux-fsdevel@vger.kernel.org
   S:    Maintained
@@@ -7908,9 -7858,9 +7909,9 @@@ S:      Maintaine
   F:    drivers/input/touchscreen/goodix.c
   
   GOOGLE ETHERNET DRIVERS
- -M:    Catherine Sullivan <csully@google.com>
- -R:    Sagi Shahar <sagis@google.com>
- -R:    Jon Olson <jonolson@google.com>
+ +M:    Jeroen de Borst <jeroendb@google.com>
+ +R:    Catherine Sullivan <csully@google.com>
+ +R:    David Awogbemila <awogbemila@google.com>
   L:    netdev@vger.kernel.org
   S:    Supported
   F:    Documentation/networking/device_drivers/ethernet/google/gve.rst
@@@ -8483,12 -8433,10 +8484,12 @@@ S:   Maintaine
   F:    Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml
   F:    drivers/spmi/hisi-spmi-controller.c
   
- -HISILICON STAGING DRIVERS FOR HIKEY 960/970
+ +HISILICON SPMI PMIC DRIVER FOR HIKEY 6421v600
   M:    Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+ +L:    linux-kernel@vger.kernel.org
   S:    Maintained
- -F:    drivers/staging/hikey9xx/
+ +F:    Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml
+ +F:    drivers/mfd/hi6421-spmi-pmic.c
   
   HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT
   M:    Zaibo Xu <xuzaibo@huawei.com>
@@@ -8647,9 -8595,6 +8648,9 @@@ T:      git git://git.kernel.org/pub/scm/lin
   F:    Documentation/ABI/stable/sysfs-bus-vmbus
   F:    Documentation/ABI/testing/debugfs-hyperv
   F:    Documentation/networking/device_drivers/ethernet/microsoft/netvsc.rst
+ +F:    arch/arm64/hyperv
+ +F:    arch/arm64/include/asm/hyperv-tlfs.h
+ +F:    arch/arm64/include/asm/mshyperv.h
   F:    arch/x86/hyperv
   F:    arch/x86/include/asm/hyperv-tlfs.h
   F:    arch/x86/include/asm/mshyperv.h
@@@ -9096,7 -9041,7 +9097,7 @@@ F:      drivers/usb/atm/ueagle-atm.
   IMGTEC ASCII LCD DRIVER
   M:    Paul Burton <paulburton@kernel.org>
   S:    Maintained
- F:    Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt
+ F:    Documentation/devicetree/bindings/auxdisplay/img,ascii-lcd.yaml
   F:    drivers/auxdisplay/img-ascii-lcd.c
   
   IMGTEC IR DECODER DRIVER
@@@ -9306,7 -9251,7 +9307,7 @@@ S:      Supporte
   W:    https://01.org/linuxgraphics/
   Q:    http://patchwork.freedesktop.org/project/intel-gfx/
   B:    https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs
- -C:    irc://chat.freenode.net/intel-gfx
+ +C:    irc://irc.oftc.net/intel-gfx
   T:    git git://anongit.freedesktop.org/drm-intel
   F:    Documentation/gpu/i915.rst
   F:    drivers/gpu/drm/i915/
@@@ -9804,6 -9749,11 +9805,6 @@@ M:     David Sterba <dsterba@suse.com
   S:    Odd Fixes
   F:    drivers/tty/ipwireless/
   
- -IPX NETWORK LAYER
- -L:    netdev@vger.kernel.org
- -S:    Obsolete
- -F:    include/uapi/linux/ipx.h
- -
   IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
   M:    Marc Zyngier <maz@kernel.org>
   S:    Maintained
@@@ -10153,17 -10103,6 +10154,17 @@@ T: git git://git.kernel.org/pub/scm/lin
   F:    Documentation/dev-tools/kselftest*
   F:    tools/testing/selftests/
   
+ +KERNEL SMB3 SERVER (KSMBD)
+ +M:    Namjae Jeon <linkinjeon@kernel.org>
+ +M:    Sergey Senozhatsky <senozhatsky@chromium.org>
+ +M:    Steve French <sfrench@samba.org>
+ +M:    Hyunchul Lee <hyc.lee@gmail.com>
+ +L:    linux-cifs@vger.kernel.org
+ +S:    Maintained
+ +T:    git git://git.samba.org/ksmbd.git
+ +F:    fs/cifs_common/
+ +F:    fs/ksmbd/
+ +
   KERNEL UNIT TESTING FRAMEWORK (KUnit)
   M:    Brendan Higgins <brendanhiggins@google.com>
   L:    linux-kselftest@vger.kernel.org
@@@ -10449,7 -10388,6 +10450,7 @@@ F:   net/core/skmsg.
   F:    net/core/sock_map.c
   F:    net/ipv4/tcp_bpf.c
   F:    net/ipv4/udp_bpf.c
+ +F:    net/unix/unix_bpf.c
   
   LANDLOCK SECURITY MODULE
   M:    Mickaël Salaün <mic@digikod.net>
@@@ -10671,6 -10609,15 +10672,6 @@@ F:  LICENSES
   F:    scripts/spdxcheck-test.sh
   F:    scripts/spdxcheck.py
   
- -LIGHTNVM PLATFORM SUPPORT
- -M:    Matias Bjorling <mb@lightnvm.io>
- -L:    linux-block@vger.kernel.org
- -S:    Maintained
- -W:    http://github/OpenChannelSSD
- -F:    drivers/lightnvm/
- -F:    include/linux/lightnvm.h
- -F:    include/uapi/linux/lightnvm.h
- -
   LINEAR RANGES HELPERS
   M:    Mark Brown <broonie@kernel.org>
   R:    Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
@@@ -11083,18 -11030,6 +11084,18 @@@ F: drivers/mailbox/arm_mhuv2.
   F:    include/linux/mailbox/arm_mhuv2_message.h
   F:    Documentation/devicetree/bindings/mailbox/arm,mhuv2.yaml
   
+ +MANAGEMENT COMPONENT TRANSPORT PROTOCOL (MCTP)
+ +M:    Jeremy Kerr <jk@codeconstruct.com.au>
+ +M:    Matt Johnston <matt@codeconstruct.com.au>
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    Documentation/networking/mctp.rst
+ +F:    drivers/net/mctp/
+ +F:    include/net/mctp.h
+ +F:    include/net/mctpdevice.h
+ +F:    include/net/netns/mctp.h
+ +F:    net/mctp/
+ +
   MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
   M:    Michael Kerrisk <mtk.manpages@gmail.com>
   L:    linux-man@vger.kernel.org
@@@ -11392,18 -11327,6 +11393,18 @@@ W: https://linuxtv.or
   T:    git git://linuxtv.org/media_tree.git
   F:    drivers/media/radio/radio-maxiradio*
   
+ +MAXLINEAR ETHERNET PHY DRIVER
+ +M:    Xu Liang <lxu@maxlinear.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Supported
+ +F:    drivers/net/phy/mxl-gpy.c
+ +
+ +MCBA MICROCHIP CAN BUS ANALYZER TOOL DRIVER
+ +R:    Yasushi SHOJI <yashi@spacecubics.com>
+ +L:    linux-can@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/net/can/usb/mcba_usb.c
+ +
   MCAN MMIO DEVICE DRIVER
   M:    Chandrasekar Ramakrishnan <rcsekar@samsung.com>
   L:    linux-can@vger.kernel.org
@@@ -11835,7 -11758,6 +11836,7 @@@ F:   drivers/char/hw_random/mtk-rng.
   MEDIATEK SWITCH DRIVER
   M:    Sean Wang <sean.wang@mediatek.com>
   M:    Landen Chao <Landen.Chao@mediatek.com>
+ +M:    DENG Qingfang <dqfext@gmail.com>
   L:    netdev@vger.kernel.org
   S:    Maintained
   F:    drivers/net/dsa/mt7530.*
@@@ -13851,15 -13773,6 +13852,15 @@@ T: git git://linuxtv.org/media_tree.gi
   F:    Documentation/devicetree/bindings/media/i2c/ov8856.yaml
   F:    drivers/media/i2c/ov8856.c
   
+ +OMNIVISION OV9282 SENSOR DRIVER
+ +M:    Paul J. Murphy <paul.j.murphy@intel.com>
+ +M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
+ +L:    linux-media@vger.kernel.org
+ +S:    Maintained
+ +T:    git git://linuxtv.org/media_tree.git
+ +F:    Documentation/devicetree/bindings/media/i2c/ovti,ov9282.yaml
+ +F:    drivers/media/i2c/ov9282.c
+ +
   OMNIVISION OV9640 SENSOR DRIVER
   M:    Petr Cvek <petrcvekcz@gmail.com>
   L:    linux-media@vger.kernel.org
@@@ -13950,12 -13863,6 +13951,12 @@@ F: Documentation/devicetree
   F:    arch/*/boot/dts/
   F:    include/dt-bindings/
   
+ +OPENCOMPUTE PTP CLOCK DRIVER
+ +M:    Jonathan Lemon <jonathan.lemon@gmail.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/ptp/ptp_ocp.c
+ +
   OPENCORES I2C BUS DRIVER
   M:    Peter Korsgaard <peter@korsgaard.com>
   M:    Andrew Lunn <andrew@lunn.ch>
@@@ -14281,7 -14188,7 +14282,7 @@@ M:   Lucas Stach <l.stach@pengutronix.de
   L:    linux-pci@vger.kernel.org
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
- F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
+ F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml
   F:    drivers/pci/controller/dwc/*imx6*
   
   PCI DRIVER FOR FU740
@@@ -14369,7 -14276,8 +14370,8 @@@ M:   Jingoo Han <jingoohan1@gmail.com
   M:    Gustavo Pimentel <gustavo.pimentel@synopsys.com>
   L:    linux-pci@vger.kernel.org
   S:    Maintained
- F:    Documentation/devicetree/bindings/pci/designware-pcie.txt
+ F:    Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
+ F:    Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml
   F:    drivers/pci/controller/dwc/*designware*
   
   PCI DRIVER FOR TI DRA7XX/J721E
@@@ -14506,7 -14414,7 +14508,7 @@@ M:   Xiaowei Song <songxiaowei@hisilicon.
   M:    Binghui Wang <wangbinghui@hisilicon.com>
   L:    linux-pci@vger.kernel.org
   S:    Maintained
- F:    Documentation/devicetree/bindings/pci/kirin-pcie.txt
+ F:    Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml
   F:    drivers/pci/controller/dwc/pcie-kirin.c
   
   PCIE DRIVER FOR HISILICON STB
@@@ -14516,13 -14424,6 +14518,13 @@@ S: Maintaine
   F:    Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt
   F:    drivers/pci/controller/dwc/pcie-histb.c
   
+ +PCIE DRIVER FOR INTEL LGM GW SOC
+ +M:    Rahul Tanwar <rtanwar@maxlinear.com>
+ +L:    linux-pci@vger.kernel.org
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml
+ +F:    drivers/pci/controller/dwc/pcie-intel-gw.c
+ +
   PCIE DRIVER FOR MEDIATEK
   M:    Ryder Lee <ryder.lee@mediatek.com>
   M:    Jianjun Wang <jianjun.wang@mediatek.com>
@@@ -15019,6 -14920,13 +15021,6 @@@ S:  Maintaine
   F:    include/linux/printk.h
   F:    kernel/printk/
   
- -PRISM54 WIRELESS DRIVER
- -M:    Luis Chamberlain <mcgrof@kernel.org>
- -L:    linux-wireless@vger.kernel.org
- -S:    Obsolete
- -W:    https://wireless.wiki.kernel.org/en/users/Drivers/p54
- -F:    drivers/net/wireless/intersil/prism54/
- -
   PROC FILESYSTEM
   L:    linux-kernel@vger.kernel.org
   L:    linux-fsdevel@vger.kernel.org
@@@ -15103,13 -15011,6 +15105,13 @@@ F: drivers/net/phy/dp83640
   F:    drivers/ptp/*
   F:    include/linux/ptp_cl*
   
+ +PTP VIRTUAL CLOCK SUPPORT
+ +M:    Yangbo Lu <yangbo.lu@nxp.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/ptp/ptp_vclock.c
+ +F:    net/ethtool/phc_vclocks.c
+ +
   PTRACE SUPPORT
   M:    Oleg Nesterov <oleg@redhat.com>
   S:    Maintained
@@@ -15560,8 -15461,6 +15562,8 @@@ M:   Pan, Xinhui <Xinhui.Pan@amd.com
   L:    amd-gfx@lists.freedesktop.org
   S:    Supported
   T:    git https://gitlab.freedesktop.org/agd5f/linux.git
+ +B:    https://gitlab.freedesktop.org/drm/amd/-/issues
+ +C:    irc://irc.oftc.net/radeon
   F:    drivers/gpu/drm/amd/
   F:    drivers/gpu/drm/radeon/
   F:    include/uapi/drm/amdgpu_drm.h
@@@ -15889,7 -15788,7 +15891,7 @@@ F:   Documentation/devicetree/bindings/i2
   F:    drivers/i2c/busses/i2c-emev2.c
   
   RENESAS ETHERNET DRIVERS
- -R:    Sergei Shtylyov <sergei.shtylyov@gmail.com>
+ +R:    Sergey Shtylyov <s.shtylyov@omp.ru>
   L:    netdev@vger.kernel.org
   L:    linux-renesas-soc@vger.kernel.org
   F:    Documentation/devicetree/bindings/net/renesas,*.yaml
@@@ -15934,14 -15833,6 +15936,14 @@@ L: linux-renesas-soc@vger.kernel.or
   S:    Maintained
   F:    drivers/phy/renesas/phy-rcar-gen3-usb*.c
   
+ +RENESAS RZ/G2L A/D DRIVER
+ +M:    Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
+ +L:    linux-iio@vger.kernel.org
+ +L:    linux-renesas-soc@vger.kernel.org
+ +S:    Supported
+ +F:    Documentation/devicetree/bindings/iio/adc/renesas,rzg2l-adc.yaml
+ +F:    drivers/iio/adc/rzg2l_adc.c
+ +
   RESET CONTROLLER FRAMEWORK
   M:    Philipp Zabel <p.zabel@pengutronix.de>
   S:    Maintained
@@@ -16412,7 -16303,7 +16414,7 @@@ SAMSUNG EXYNOS TRUE RANDOM NUMBER GENER
   M:    Łukasz Stelmach <l.stelmach@samsung.com>
   L:    linux-samsung-soc@vger.kernel.org
   S:    Maintained
- F:    Documentation/devicetree/bindings/rng/samsung,exynos5250-trng.txt
+ F:    Documentation/devicetree/bindings/rng/samsung,exynos5250-trng.yaml
   F:    drivers/char/hw_random/exynos-trng.c
   
   SAMSUNG FRAMEBUFFER DRIVER
@@@ -16550,12 -16441,6 +16552,12 @@@ F: drivers/phy/samsung/phy-s5pv210-usb2
   F:    drivers/phy/samsung/phy-samsung-usb2.c
   F:    drivers/phy/samsung/phy-samsung-usb2.h
   
+ +SANCLOUD BEAGLEBONE ENHANCED DEVICE TREE
+ +M:    Paul Barker <paul.barker@sancloud.com>
+ +R:    Marc Murphy <marc.murphy@sancloud.com>
+ +S:    Supported
+ +F:    arch/arm/boot/dts/am335x-sancloud*
+ +
   SC1200 WDT DRIVER
   M:    Zwane Mwaikambo <zwanem@gmail.com>
   S:    Maintained
@@@ -16815,12 -16700,6 +16817,12 @@@ F: drivers/iio/chemical/scd30_core.
   F:    drivers/iio/chemical/scd30_i2c.c
   F:    drivers/iio/chemical/scd30_serial.c
   
+ +SENSIRION SGP40 GAS SENSOR DRIVER
+ +M:    Andreas Klinger <ak@it-klinger.de>
+ +S:    Maintained
+ +F:    Documentation/ABI/testing/sysfs-bus-iio-chemical-sgp40
+ +F:    drivers/iio/chemical/sgp40.c
+ +
   SENSIRION SPS30 AIR POLLUTION SENSOR DRIVER
   M:    Tomasz Duszynski <tduszyns@gmail.com>
   S:    Maintained
@@@ -17399,15 -17278,6 +17401,15 @@@ T: git git://linuxtv.org/media_tree.gi
   F:    Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
   F:    drivers/media/i2c/imx334.c
   
+ +SONY IMX335 SENSOR DRIVER
+ +M:    Paul J. Murphy <paul.j.murphy@intel.com>
+ +M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
+ +L:    linux-media@vger.kernel.org
+ +S:    Maintained
+ +T:    git git://linuxtv.org/media_tree.git
+ +F:    Documentation/devicetree/bindings/media/i2c/sony,imx335.yaml
+ +F:    drivers/media/i2c/imx335.c
+ +
   SONY IMX355 SENSOR DRIVER
   M:    Tianshu Qiu <tian.shu.qiu@intel.com>
   L:    linux-media@vger.kernel.org
@@@ -17415,15 -17285,6 +17417,15 @@@ S: Maintaine
   T:    git git://linuxtv.org/media_tree.git
   F:    drivers/media/i2c/imx355.c
   
+ +SONY IMX412 SENSOR DRIVER
+ +M:    Paul J. Murphy <paul.j.murphy@intel.com>
+ +M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
+ +L:    linux-media@vger.kernel.org
+ +S:    Maintained
+ +T:    git git://linuxtv.org/media_tree.git
+ +F:    Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
+ +F:    drivers/media/i2c/imx412.c
+ +
   SONY MEMORYSTICK SUBSYSTEM
   M:    Maxim Levitsky <maximlevitsky@gmail.com>
   M:    Alex Dubov <oakad@yahoo.com>
@@@ -17743,9 -17604,8 +17745,9 @@@ F:   drivers/staging/olpc_dcon
   
   STAGING - REALTEK RTL8188EU DRIVERS
   M:    Larry Finger <Larry.Finger@lwfinger.net>
- -S:    Odd Fixes
- -F:    drivers/staging/rtl8188eu/
+ +M:    Phillip Potter <phil@philpotter.co.uk>
+ +S:    Supported
+ +F:    drivers/staging/r8188eu/
   
   STAGING - REALTEK RTL8712U DRIVERS
   M:    Larry Finger <Larry.Finger@lwfinger.net>
@@@ -17940,7 -17800,7 +17942,7 @@@ F:   include/linux/sync_file.
   F:    include/uapi/linux/sync_file.h
   
   SYNOPSYS ARC ARCHITECTURE
- -M:    Vineet Gupta <vgupta@synopsys.com>
+ +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
@@@ -18082,7 -17942,6 +18084,7 @@@ F:   drivers/regulator/scmi-regulator.
   F:    drivers/reset/reset-scmi.c
   F:    include/linux/sc[mp]i_protocol.h
   F:    include/trace/events/scmi.h
+ +F:    include/uapi/linux/virtio_scmi.h
   
   SYSTEM RESET/SHUTDOWN DRIVERS
   M:    Sebastian Reichel <sre@kernel.org>
@@@ -19257,7 -19116,7 +19259,7 @@@ M:   Mauro Carvalho Chehab <mchehab@kerne
   L:    linux-usb@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml
- -F:    drivers/phy/hisilicon/phy-kirin970-usb3.c
+ +F:    drivers/phy/hisilicon/phy-hi3670-usb3.c
   
   USB ISP116X DRIVER
   M:    Olav Kongas <ok@artecdesign.ee>
@@@ -19842,15 -19701,6 +19844,15 @@@ S: Maintaine
   F:    include/uapi/linux/virtio_snd.h
   F:    sound/virtio/*
   
+ +VIRTIO I2C DRIVER
+ +M:    Jie Deng <jie.deng@intel.com>
+ +M:    Viresh Kumar <viresh.kumar@linaro.org>
+ +L:    linux-i2c@vger.kernel.org
+ +L:    virtualization@lists.linux-foundation.org
+ +S:    Maintained
+ +F:    drivers/i2c/busses/i2c-virtio.c
+ +F:    include/uapi/linux/virtio_i2c.h
+ +
   VIRTUAL BOX GUEST DEVICE DRIVER
   M:    Hans de Goede <hdegoede@redhat.com>
   M:    Arnd Bergmann <arnd@arndb.de>
@@@ -19944,14 -19794,6 +19946,14 @@@ L: netdev@vger.kernel.or
   S:    Supported
   F:    drivers/ptp/ptp_vmw.c
   
+ +VMWARE VMCI DRIVER
+ +M:    Jorgen Hansen <jhansen@vmware.com>
+ +M:    Vishnu Dasa <vdasa@vmware.com>
+ +L:    linux-kernel@vger.kernel.org
+ +L:    pv-drivers@vmware.com (private)
+ +S:    Maintained
+ +F:    drivers/misc/vmw_vmci/
+ +
   VMWARE VMMOUSE SUBDRIVER
   M:    "VMware Graphics" <linux-graphics-maintainer@vmware.com>
   M:    "VMware, Inc." <pv-drivers@vmware.com>
@@@ -20152,8 -19994,7 +20154,8 @@@ F:   Documentation/devicetree/bindings/ex
   F:    Documentation/devicetree/bindings/mfd/wlf,arizona.yaml
   F:    Documentation/devicetree/bindings/mfd/wm831x.txt
   F:    Documentation/devicetree/bindings/regulator/wlf,arizona.yaml
- -F:    Documentation/devicetree/bindings/sound/wlf,arizona.yaml
+ +F:    Documentation/devicetree/bindings/sound/wlf,*.yaml
+ +F:    Documentation/devicetree/bindings/sound/wm*
   F:    Documentation/hwmon/wm83??.rst
   F:    arch/arm/mach-s3c/mach-crag6410*
   F:    drivers/clk/clk-wm83*.c
diff --combined arch/arm64/mm/init.c

index 1fdb7bb,4e90a1d..edc8e95
--- 1/arch/arm64/mm/init.c
--- 2/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@@ -124,57 -124,6 +124,6 @@@ static void __init reserve_crashkernel(
   }
   #endif /* CONFIG_KEXEC_CORE */
   
- #ifdef CONFIG_CRASH_DUMP
- static int __init early_init_dt_scan_elfcorehdr(unsigned long node,
-               const char *uname, int depth, void *data)
- {
-       const __be32 *reg;
-       int len;
- 
-       if (depth != 1 || strcmp(uname, "chosen") != 0)
-               return 0;
- 
-       reg = of_get_flat_dt_prop(node, "linux,elfcorehdr", &len);
-       if (!reg || (len < (dt_root_addr_cells + dt_root_size_cells)))
-               return 1;
- 
-       elfcorehdr_addr = dt_mem_next_cell(dt_root_addr_cells, &reg);
-       elfcorehdr_size = dt_mem_next_cell(dt_root_size_cells, &reg);
- 
-       return 1;
- }
- 
- /*
-  * reserve_elfcorehdr() - reserves memory for elf core header
-  *
-  * This function reserves the memory occupied by an elf core header
-  * described in the device tree. This region contains all the
-  * information about primary kernel's core image and is used by a dump
-  * capture kernel to access the system memory on primary kernel.
-  */
- static void __init reserve_elfcorehdr(void)
- {
-       of_scan_flat_dt(early_init_dt_scan_elfcorehdr, NULL);
- 
-       if (!elfcorehdr_size)
-               return;
- 
-       if (memblock_is_region_reserved(elfcorehdr_addr, elfcorehdr_size)) {
-               pr_warn("elfcorehdr is overlapped\n");
-               return;
-       }
- 
-       memblock_reserve(elfcorehdr_addr, elfcorehdr_size);
- 
-       pr_info("Reserving %lldKB of memory at 0x%llx for elfcorehdr\n",
-               elfcorehdr_size >> 10, elfcorehdr_addr);
- }
- #else
- static void __init reserve_elfcorehdr(void)
- {
- }
- #endif /* CONFIG_CRASH_DUMP */
- 
   /*
    * Return the maximum physical address for a zone accessible by the given bits
    * limit. If DRAM starts above 32-bit, expand the zone to the maximum
@@@ -219,43 -168,6 +168,43 @@@ static void __init zone_sizes_init(unsi
         free_area_init(max_zone_pfns);
   }
   
+ +int pfn_valid(unsigned long pfn)
+ +{
+ +      phys_addr_t addr = PFN_PHYS(pfn);
+ +      struct mem_section *ms;
+ +
+ +      /*
+ +       * Ensure the upper PAGE_SHIFT bits are clear in the
+ +       * pfn. Else it might lead to false positives when
+ +       * some of the upper bits are set, but the lower bits
+ +       * match a valid pfn.
+ +       */
+ +      if (PHYS_PFN(addr) != pfn)
+ +              return 0;
+ +
+ +      if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS)
+ +              return 0;
+ +
+ +      ms = __pfn_to_section(pfn);
+ +      if (!valid_section(ms))
+ +              return 0;
+ +
+ +      /*
+ +       * ZONE_DEVICE memory does not have the memblock entries.
+ +       * memblock_is_map_memory() check for ZONE_DEVICE based
+ +       * addresses will always fail. Even the normal hotplugged
+ +       * memory will never have MEMBLOCK_NOMAP flag set in their
+ +       * memblock entries. Skip memblock search for all non early
+ +       * memory sections covering all of hotplug memory including
+ +       * both normal and ZONE_DEVICE based.
+ +       */
+ +      if (!early_section(ms))
+ +              return pfn_section_valid(ms, pfn);
+ +
+ +      return memblock_is_memory(addr);
+ +}
+ +EXPORT_SYMBOL(pfn_valid);
+ +
   int pfn_is_map_memory(unsigned long pfn)
   {
         phys_addr_t addr = PFN_PHYS(pfn);
@@@ -285,45 -197,10 +234,10 @@@ static int __init early_mem(char *p
   }
   early_param("mem", early_mem);
   
- static int __init early_init_dt_scan_usablemem(unsigned long node,
-               const char *uname, int depth, void *data)
- {
-       struct memblock_region *usablemem = data;
-       const __be32 *reg;
-       int len;
- 
-       if (depth != 1 || strcmp(uname, "chosen") != 0)
-               return 0;
- 
-       reg = of_get_flat_dt_prop(node, "linux,usable-memory-range", &len);
-       if (!reg || (len < (dt_root_addr_cells + dt_root_size_cells)))
-               return 1;
- 
-       usablemem->base = dt_mem_next_cell(dt_root_addr_cells, &reg);
-       usablemem->size = dt_mem_next_cell(dt_root_size_cells, &reg);
- 
-       return 1;
- }
- 
- static void __init fdt_enforce_memory_region(void)
- {
-       struct memblock_region reg = {
-               .size = 0,
-       };
- 
-       of_scan_flat_dt(early_init_dt_scan_usablemem, &reg);
- 
-       if (reg.size)
-               memblock_cap_memory_range(reg.base, reg.size);
- }
- 
   void __init arm64_memblock_init(void)
   {
         const s64 linear_region_size = PAGE_END - _PAGE_OFFSET(vabits_actual);
   
-       /* Handle linux,usable-memory-range property */
-       fdt_enforce_memory_region();
- 
         /* Remove memory above our supported physical address size */
         memblock_remove(1ULL << PHYS_MASK_SHIFT, ULLONG_MAX);
   
@@@ -432,8 -309,6 +346,6 @@@
   
         early_init_fdt_scan_reserved_mem();
   
-       reserve_elfcorehdr();
- 
         high_memory = __va(memblock_end_of_DRAM() - 1) + 1;
   }
   
diff --combined arch/riscv/mm/init.c

index 7cb4f39,4aa4b6a..93720b0
--- 1/arch/riscv/mm/init.c
--- 2/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@@ -36,9 -36,6 +36,9 @@@ EXPORT_SYMBOL(kernel_map)
   #define kernel_map    (*(struct kernel_mapping *)XIP_FIXUP(&kernel_map))
   #endif
   
+ +phys_addr_t phys_ram_base __ro_after_init;
+ +EXPORT_SYMBOL(phys_ram_base);
+ +
   #ifdef CONFIG_XIP_KERNEL
   extern char _xiprom[], _exiprom[];
   #endif
@@@ -130,17 -127,10 +130,17 @@@ void __init mem_init(void
   }
   
   /*
- - * The default maximal physical memory size is -PAGE_OFFSET,
- - * limit the memory size via mem.
+ + * The default maximal physical memory size is -PAGE_OFFSET for 32-bit kernel,
+ + * whereas for 64-bit kernel, the end of the virtual address space is occupied
+ + * by the modules/BPF/kernel mappings which reduces the available size of the
+ + * linear mapping.
+ + * Limit the memory size via mem.
    */
+ +#ifdef CONFIG_64BIT
+ +static phys_addr_t memory_limit = -PAGE_OFFSET - SZ_4G;
+ +#else
   static phys_addr_t memory_limit = -PAGE_OFFSET;
+ +#endif
   
   static int __init early_mem(char *p)
   {
@@@ -162,8 -152,8 +162,8 @@@ static void __init setup_bootmem(void
   {
         phys_addr_t vmlinux_end = __pa_symbol(&_end);
         phys_addr_t vmlinux_start = __pa_symbol(&_start);
- -      phys_addr_t max_mapped_addr = __pa(~(ulong)0);
- -      phys_addr_t dram_end;
+ +      phys_addr_t __maybe_unused max_mapped_addr;
+ +      phys_addr_t phys_ram_end;
   
   #ifdef CONFIG_XIP_KERNEL
         vmlinux_start = __pa_symbol(&_sdata);
@@@ -184,28 -174,18 +184,28 @@@
   #endif
         memblock_reserve(vmlinux_start, vmlinux_end - vmlinux_start);
   
- -      dram_end = memblock_end_of_DRAM();
+ +
+ +      phys_ram_end = memblock_end_of_DRAM();
+ +#ifndef CONFIG_64BIT
+ +#ifndef CONFIG_XIP_KERNEL
+ +      phys_ram_base = memblock_start_of_DRAM();
+ +#endif
         /*
          * memblock allocator is not aware of the fact that last 4K bytes of
          * the addressable memory can not be mapped because of IS_ERR_VALUE
          * macro. Make sure that last 4k bytes are not usable by memblock
- -       * if end of dram is equal to maximum addressable memory.
+ +       * if end of dram is equal to maximum addressable memory.  For 64-bit
+ +       * kernel, this problem can't happen here as the end of the virtual
+ +       * address space is occupied by the kernel mapping then this check must
+ +       * be done as soon as the kernel mapping base address is determined.
          */
- -      if (max_mapped_addr == (dram_end - 1))
+ +      max_mapped_addr = __pa(~(ulong)0);
+ +      if (max_mapped_addr == (phys_ram_end - 1))
                 memblock_set_current_limit(max_mapped_addr - 4096);
+ +#endif
   
- -      min_low_pfn = PFN_UP(memblock_start_of_DRAM());
- -      max_low_pfn = max_pfn = PFN_DOWN(dram_end);
+ +      min_low_pfn = PFN_UP(phys_ram_base);
+ +      max_low_pfn = max_pfn = PFN_DOWN(phys_ram_end);
   
         dma32_phys_limit = min(4UL * SZ_1G, (unsigned long)PFN_PHYS(max_low_pfn));
         set_max_mapnr(max_low_pfn - ARCH_PFN_OFFSET);
@@@ -564,7 -544,6 +564,7 @@@ asmlinkage void __init setup_vm(uintptr
         kernel_map.xiprom = (uintptr_t)CONFIG_XIP_PHYS_ADDR;
         kernel_map.xiprom_sz = (uintptr_t)(&_exiprom) - (uintptr_t)(&_xiprom);
   
+ +      phys_ram_base = CONFIG_PHYS_RAM_BASE;
         kernel_map.phys_addr = (uintptr_t)CONFIG_PHYS_RAM_BASE;
         kernel_map.size = (uintptr_t)(&_end) - (uintptr_t)(&_sdata);
   
@@@ -591,14 -570,6 +591,14 @@@
         BUG_ON((PAGE_OFFSET % PGDIR_SIZE) != 0);
         BUG_ON((kernel_map.phys_addr % map_size) != 0);
   
+ +#ifdef CONFIG_64BIT
+ +      /*
+ +       * The last 4K bytes of the addressable memory can not be mapped because
+ +       * of IS_ERR_VALUE macro.
+ +       */
+ +      BUG_ON((kernel_map.virt_addr + kernel_map.size) > ADDRESS_SPACE_END - SZ_4K);
+ +#endif
+ +
         pt_ops.alloc_pte = alloc_pte_early;
         pt_ops.get_pte_virt = get_pte_virt_early;
   #ifndef __PAGETABLE_PMD_FOLDED
@@@ -738,8 -709,6 +738,8 @@@ static void __init setup_vm_final(void
                 if (start <= __pa(PAGE_OFFSET) &&
                     __pa(PAGE_OFFSET) < end)
                         start = __pa(PAGE_OFFSET);
+ +              if (end >= __pa(PAGE_OFFSET) + memory_limit)
+ +                      end = __pa(PAGE_OFFSET) + memory_limit;
   
                 map_size = best_map_size(start, end - start);
                 for (pa = start; pa < end; pa += map_size) {
@@@ -860,26 -829,6 +860,6 @@@ static void __init reserve_crashkernel(
   }
   #endif /* CONFIG_KEXEC_CORE */
   
- #ifdef CONFIG_CRASH_DUMP
- /*
-  * We keep track of the ELF core header of the crashed
-  * kernel with a reserved-memory region with compatible
-  * string "linux,elfcorehdr". Here we register a callback
-  * to populate elfcorehdr_addr/size when this region is
-  * present. Note that this region will be marked as
-  * reserved once we call early_init_fdt_scan_reserved_mem()
-  * later on.
-  */
- static int __init elfcore_hdr_setup(struct reserved_mem *rmem)
- {
-       elfcorehdr_addr = rmem->base;
-       elfcorehdr_size = rmem->size;
-       return 0;
- }
- 
- RESERVEDMEM_OF_DECLARE(elfcorehdr, "linux,elfcorehdr", elfcore_hdr_setup);
- #endif
- 
   void __init paging_init(void)
   {
         setup_bootmem();
diff --combined drivers/of/base.c

index 5883d63,ca60988..f720c0d
--- 1/drivers/of/base.c
--- 2/drivers/of/base.c
+++ b/drivers/of/base.c
@@@ -708,9 -708,7 +708,7 @@@ static struct device_node *__of_get_nex
                 return NULL;
   
         next = prev ? prev->sibling : node->child;
-       for (; next; next = next->sibling)
-               if (of_node_get(next))
-                       break;
+       of_node_get(next);
         of_node_put(prev);
         return next;
   }
@@@ -1821,7 -1819,6 +1819,7 @@@ int of_add_property(struct device_node 
   
         return rc;
   }
+ +EXPORT_SYMBOL_GPL(of_add_property);
   
   int __of_remove_property(struct device_node *np, struct property *prop)
   {
author	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 2 Sep 2021 01:34:51 +0000 (18:34 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 2 Sep 2021 01:34:51 +0000 (18:34 -0700)
		1	2
Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/serial/8250_omap.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/trivial-devices.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/vendor-prefixes.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/init.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/riscv/mm/init.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/of/base.c	patch \|	diff1 \|	diff2 \|	blob \| history