Merge tag 'exynos-drm-fixes-for-v6.4-rc3' of git://git.kernel.org/pub/scm/linux/kerne...
authorDave Airlie <airlied@redhat.com>
Fri, 19 May 2023 00:43:54 +0000 (10:43 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 19 May 2023 00:44:07 +0000 (10:44 +1000)
Just one fixup to exynos_drm_g2d module.
- Fix below build warning by marking them as 'static inline'
    drivers/gpu/drm/exynos/exynos_drm_g2d.h:37:5: error: no previous prototype for 'g2d_open'
    drivers/gpu/drm/exynos/exynos_drm_g2d.h:42:5: error: no previous prototype for 'g2d_close'

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230515083943.43933-1-inki.dae@samsung.com
163 files changed:
Documentation/block/index.rst
Documentation/block/request.rst [deleted file]
Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-common.yaml
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml
Documentation/networking/bonding.rst
Documentation/networking/index.rst
Documentation/networking/x25-iface.rst
MAINTAINERS
Makefile
arch/arm/kernel/unwind.c
arch/arm/mach-sa1100/jornada720_ssp.c
arch/arm/vfp/entry.S
arch/arm/vfp/vfphw.S
arch/parisc/include/asm/pgtable.h
arch/parisc/kernel/kexec.c
arch/riscv/kernel/pi/Makefile
arch/riscv/kernel/vmlinux.lds.S
arch/x86/events/core.c
arch/x86/events/intel/ds.c
arch/x86/include/asm/perf_event.h
arch/x86/kernel/amd_nb.c
arch/x86/lib/retpoline.S
drivers/block/nbd.c
drivers/block/rnbd/rnbd-proto.h
drivers/block/ublk_drv.c
drivers/cxl/core/pci.c
drivers/firewire/net.c
drivers/hwmon/k10temp.c
drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c
drivers/media/platform/renesas/rcar-vin/rcar-dma.c
drivers/net/bonding/bond_netlink.c
drivers/net/bonding/bond_options.c
drivers/net/ethernet/google/gve/gve_main.c
drivers/net/ethernet/mediatek/mtk_wed.c
drivers/net/ethernet/mscc/vsc7514_regs.c
drivers/net/ethernet/stmicro/stmmac/dwmac4.h
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
drivers/net/ipvlan/ipvlan_core.c
drivers/net/mdio/mdio-mvusb.c
drivers/net/pcs/pcs-xpcs.c
drivers/net/phy/bcm-phy-lib.h
drivers/net/phy/bcm7xxx.c
drivers/net/tap.c
drivers/platform/mellanox/mlxbf-tmfifo.c
drivers/platform/x86/hp/hp-wmi.c
drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c
drivers/platform/x86/intel_scu_pcidrv.c
drivers/platform/x86/thinkpad_acpi.c
drivers/platform/x86/touchscreen_dmi.c
drivers/ufs/core/ufshcd.c
drivers/video/fbdev/68328fb.c
drivers/video/fbdev/arcfb.c
drivers/video/fbdev/atmel_lcdfb.c
drivers/video/fbdev/cg14.c
drivers/video/fbdev/controlfb.c
drivers/video/fbdev/core/modedb.c
drivers/video/fbdev/g364fb.c
drivers/video/fbdev/hgafb.c
drivers/video/fbdev/hpfb.c
drivers/video/fbdev/imsttfb.c
drivers/video/fbdev/macfb.c
drivers/video/fbdev/maxinefb.c
drivers/video/fbdev/p9100.c
drivers/video/fbdev/platinumfb.c
drivers/video/fbdev/sa1100fb.c
drivers/video/fbdev/stifb.c
drivers/video/fbdev/valkyriefb.c
drivers/video/fbdev/vfb.c
fs/btrfs/backref.c
fs/btrfs/backref.h
fs/btrfs/block-rsv.c
fs/btrfs/ctree.c
fs/btrfs/disk-io.c
fs/btrfs/file-item.c
fs/btrfs/free-space-cache.c
fs/btrfs/free-space-tree.c
fs/btrfs/free-space-tree.h
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/print-tree.c
fs/btrfs/relocation.c
fs/btrfs/super.c
fs/btrfs/volumes.c
fs/btrfs/zoned.c
fs/cifs/cifsfs.c
fs/cifs/connect.c
fs/cifs/smb2ops.c
fs/cifs/smb2pdu.c
fs/ext4/balloc.c
fs/ext4/ext4.h
fs/ext4/extents_status.c
fs/ext4/hash.c
fs/ext4/ialloc.c
fs/ext4/inline.c
fs/ext4/inode.c
fs/ext4/mballoc.c
fs/ext4/migrate.c
fs/ext4/mmp.c
fs/ext4/namei.c
fs/ext4/super.c
fs/ext4/xattr.c
fs/gfs2/super.c
fs/nfs/dir.c
fs/notify/inotify/inotify_fsnotify.c
fs/pipe.c
fs/xfs/libxfs/xfs_ag.c
fs/xfs/libxfs/xfs_bmap.c
fs/xfs/scrub/bmap.c
fs/xfs/scrub/common.c
fs/xfs/scrub/common.h
fs/xfs/scrub/fscounters.c
fs/xfs/scrub/scrub.c
fs/xfs/scrub/scrub.h
fs/xfs/scrub/trace.h
fs/xfs/xfs_bmap_util.c
fs/xfs/xfs_icache.c
fs/xfs/xfs_iomap.c
fs/xfs/xfs_mount.h
fs/xfs/xfs_super.c
include/linux/dim.h
include/linux/if_vlan.h
include/linux/io_uring.h
include/linux/pci_ids.h
include/net/bonding.h
include/net/sock.h
kernel/events/core.c
kernel/locking/rwsem.c
kernel/sched/core.c
kernel/time/tick-broadcast.c
lib/dim/dim.c
lib/dim/net_dim.c
lib/dim/rdma_dim.c
net/bridge/br_forward.c
net/core/datagram.c
net/core/dev.c
net/core/skbuff.c
net/core/stream.c
net/ipv4/af_inet.c
net/ipv4/tcp.c
net/ipv4/tcp_bpf.c
net/ipv4/tcp_input.c
net/llc/af_llc.c
net/netfilter/core.c
net/netfilter/nf_conntrack_standalone.c
net/netfilter/nft_chain_filter.c
net/netlink/af_netlink.c
net/packet/af_packet.c
net/smc/smc_close.c
net/smc/smc_rx.c
net/smc/smc_tx.c
net/socket.c
net/tipc/socket.c
net/tls/tls_main.c
net/unix/af_unix.c
tools/testing/cxl/test/mock.c
tools/testing/selftests/drivers/net/bonding/bond_options.sh
tools/testing/selftests/drivers/net/bonding/bond_topo_3d1c.sh
tools/testing/selftests/net/forwarding/lib.sh
tools/testing/selftests/netfilter/nft_flowtable.sh

index 1029531..9fea696 100644 (file)
@@ -18,7 +18,6 @@ Block
    kyber-iosched
    null_blk
    pr
-   request
    stat
    switching-sched
    writeback_cache_control
diff --git a/Documentation/block/request.rst b/Documentation/block/request.rst
deleted file mode 100644 (file)
index 747021e..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-============================
-struct request documentation
-============================
-
-Jens Axboe <jens.axboe@oracle.com> 27/05/02
-
-
-.. FIXME:
-   No idea about what does mean - seems just some noise, so comment it
-
-   1.0
-   Index
-
-   2.0 Struct request members classification
-
-       2.1 struct request members explanation
-
-   3.0
-
-
-   2.0
-
-
-
-Short explanation of request members
-====================================
-
-Classification flags:
-
-       =       ====================
-       D       driver member
-       B       block layer member
-       I       I/O scheduler member
-       =       ====================
-
-Unless an entry contains a D classification, a device driver must not access
-this member. Some members may contain D classifications, but should only be
-access through certain macros or functions (eg ->flags).
-
-<linux/blkdev.h>
-
-=============================== ======= =======================================
-Member                         Flag    Comment
-=============================== ======= =======================================
-struct list_head queuelist     BI      Organization on various internal
-                                       queues
-
-``void *elevator_private``     I       I/O scheduler private data
-
-unsigned char cmd[16]          D       Driver can use this for setting up
-                                       a cdb before execution, see
-                                       blk_queue_prep_rq
-
-unsigned long flags            DBI     Contains info about data direction,
-                                       request type, etc.
-
-int rq_status                  D       Request status bits
-
-kdev_t rq_dev                  DBI     Target device
-
-int errors                     DB      Error counts
-
-sector_t sector                        DBI     Target location
-
-unsigned long hard_nr_sectors  B       Used to keep sector sane
-
-unsigned long nr_sectors       DBI     Total number of sectors in request
-
-unsigned long hard_nr_sectors  B       Used to keep nr_sectors sane
-
-unsigned short nr_phys_segments        DB      Number of physical scatter gather
-                                       segments in a request
-
-unsigned short nr_hw_segments  DB      Number of hardware scatter gather
-                                       segments in a request
-
-unsigned int current_nr_sectors        DB      Number of sectors in first segment
-                                       of request
-
-unsigned int hard_cur_sectors  B       Used to keep current_nr_sectors sane
-
-int tag                                DB      TCQ tag, if assigned
-
-``void *special``              D       Free to be used by driver
-
-``char *buffer``               D       Map of first segment, also see
-                                       section on bouncing SECTION
-
-``struct completion *waiting`` D       Can be used by driver to get signalled
-                                       on request completion
-
-``struct bio *bio``            DBI     First bio in request
-
-``struct bio *biotail``                DBI     Last bio in request
-
-``struct request_queue *q``    DB      Request queue this request belongs to
-
-``struct request_list *rl``    B       Request list this request came from
-=============================== ======= =======================================
index 8b38931..e2ffe0a 100644 (file)
@@ -49,6 +49,7 @@ properties:
 
         properties:
           data-lanes:
+            minItems: 1
             maxItems: 2
 
         required:
index 9bff8ec..d91b639 100644 (file)
@@ -17,20 +17,11 @@ description:
 properties:
   clocks:
     minItems: 3
-    items:
-      - description: PCIe bridge clock.
-      - description: PCIe bus clock.
-      - description: PCIe PHY clock.
-      - description: Additional required clock entry for imx6sx-pcie,
-           imx6sx-pcie-ep, imx8mq-pcie, imx8mq-pcie-ep.
+    maxItems: 4
 
   clock-names:
     minItems: 3
-    items:
-      - const: pcie
-      - const: pcie_bus
-      - enum: [ pcie_phy, pcie_aux ]
-      - enum: [ pcie_inbound_axi, pcie_aux ]
+    maxItems: 4
 
   num-lanes:
     const: 1
index f4a328e..ee155ed 100644 (file)
@@ -31,6 +31,19 @@ properties:
       - const: dbi
       - const: addr_space
 
+  clocks:
+    minItems: 3
+    items:
+      - description: PCIe bridge clock.
+      - description: PCIe bus clock.
+      - description: PCIe PHY clock.
+      - description: Additional required clock entry for imx6sx-pcie,
+           imx6sx-pcie-ep, imx8mq-pcie, imx8mq-pcie-ep.
+
+  clock-names:
+    minItems: 3
+    maxItems: 4
+
   interrupts:
     items:
       - description: builtin eDMA interrupter.
@@ -49,6 +62,31 @@ required:
 allOf:
   - $ref: /schemas/pci/snps,dw-pcie-ep.yaml#
   - $ref: /schemas/pci/fsl,imx6q-pcie-common.yaml#
+  - if:
+      properties:
+        compatible:
+          enum:
+            - fsl,imx8mq-pcie-ep
+    then:
+      properties:
+        clocks:
+          minItems: 4
+        clock-names:
+          items:
+            - const: pcie
+            - const: pcie_bus
+            - const: pcie_phy
+            - const: pcie_aux
+    else:
+      properties:
+        clocks:
+          maxItems: 3
+        clock-names:
+          items:
+            - const: pcie
+            - const: pcie_bus
+            - const: pcie_aux
+
 
 unevaluatedProperties: false
 
index 2443641..81bbb87 100644 (file)
@@ -40,6 +40,19 @@ properties:
       - const: dbi
       - const: config
 
+  clocks:
+    minItems: 3
+    items:
+      - description: PCIe bridge clock.
+      - description: PCIe bus clock.
+      - description: PCIe PHY clock.
+      - description: Additional required clock entry for imx6sx-pcie,
+           imx6sx-pcie-ep, imx8mq-pcie, imx8mq-pcie-ep.
+
+  clock-names:
+    minItems: 3
+    maxItems: 4
+
   interrupts:
     items:
       - description: builtin MSI controller.
@@ -77,6 +90,70 @@ required:
 allOf:
   - $ref: /schemas/pci/snps,dw-pcie.yaml#
   - $ref: /schemas/pci/fsl,imx6q-pcie-common.yaml#
+  - if:
+      properties:
+        compatible:
+          enum:
+            - fsl,imx6sx-pcie
+    then:
+      properties:
+        clocks:
+          minItems: 4
+        clock-names:
+          items:
+            - const: pcie
+            - const: pcie_bus
+            - const: pcie_phy
+            - const: pcie_inbound_axi
+
+  - if:
+      properties:
+        compatible:
+          enum:
+            - fsl,imx8mq-pcie
+    then:
+      properties:
+        clocks:
+          minItems: 4
+        clock-names:
+          items:
+            - const: pcie
+            - const: pcie_bus
+            - const: pcie_phy
+            - const: pcie_aux
+
+  - if:
+      properties:
+        compatible:
+          enum:
+            - fsl,imx6q-pcie
+            - fsl,imx6qp-pcie
+            - fsl,imx7d-pcie
+    then:
+      properties:
+        clocks:
+          maxItems: 3
+        clock-names:
+          items:
+            - const: pcie
+            - const: pcie_bus
+            - const: pcie_phy
+
+  - if:
+      properties:
+        compatible:
+          enum:
+            - fsl,imx8mm-pcie
+            - fsl,imx8mp-pcie
+    then:
+      properties:
+        clocks:
+          maxItems: 3
+        clock-names:
+          items:
+            - const: pcie
+            - const: pcie_bus
+            - const: pcie_aux
 
 unevaluatedProperties: false
 
index adc4bf4..28925e1 100644 (file)
@@ -776,10 +776,11 @@ peer_notif_delay
        Specify the delay, in milliseconds, between each peer
        notification (gratuitous ARP and unsolicited IPv6 Neighbor
        Advertisement) when they are issued after a failover event.
-       This delay should be a multiple of the link monitor interval
-       (arp_interval or miimon, whichever is active). The default
-       value is 0 which means to match the value of the link monitor
-       interval.
+       This delay should be a multiple of the MII link monitor interval
+       (miimon).
+
+       The valid range is 0 - 300000. The default value is 0, which means
+       to match the value of the MII link monitor interval.
 
 prio
        Slave priority. A higher number means higher priority.
index a164ff0..5b75c3f 100644 (file)
@@ -116,8 +116,8 @@ Contents:
    udplite
    vrf
    vxlan
-   x25-iface
    x25
+   x25-iface
    xfrm_device
    xfrm_proc
    xfrm_sync
index f34e9ec..285cefc 100644 (file)
@@ -1,8 +1,7 @@
 .. SPDX-License-Identifier: GPL-2.0
 
-============================-
 X.25 Device Driver Interface
-============================-
+============================
 
 Version 1.1
 
index 7e0b87d..e0ad886 100644 (file)
@@ -273,8 +273,8 @@ ABI/API
 L:     linux-api@vger.kernel.org
 F:     include/linux/syscalls.h
 F:     kernel/sys_ni.c
-X:     include/uapi/
 X:     arch/*/include/uapi/
+X:     include/uapi/
 
 ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
@@ -406,12 +406,6 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/acpi/arm64
 
-ACPI SERIAL MULTI INSTANTIATE DRIVER
-M:     Hans de Goede <hdegoede@redhat.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-F:     drivers/platform/x86/serial-multi-instantiate.c
-
 ACPI PCC(Platform Communication Channel) MAILBOX DRIVER
 M:     Sudeep Holla <sudeep.holla@arm.com>
 L:     linux-acpi@vger.kernel.org
@@ -430,6 +424,12 @@ B: https://bugzilla.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
 F:     drivers/acpi/pmic/
 
+ACPI SERIAL MULTI INSTANTIATE DRIVER
+M:     Hans de Goede <hdegoede@redhat.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/platform/x86/serial-multi-instantiate.c
+
 ACPI THERMAL DRIVER
 M:     Rafael J. Wysocki <rafael@kernel.org>
 R:     Zhang Rui <rui.zhang@intel.com>
@@ -823,6 +823,13 @@ L: linux-crypto@vger.kernel.org
 S:     Maintained
 F:     drivers/crypto/allwinner/
 
+ALLWINNER DMIC DRIVERS
+M:     Ban Tao <fengzheng923@gmail.com>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml
+F:     sound/soc/sunxi/sun50i-dmic.c
+
 ALLWINNER HARDWARE SPINLOCK SUPPORT
 M:     Wilken Gottwalt <wilken.gottwalt@posteo.net>
 S:     Maintained
@@ -844,13 +851,6 @@ L: linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/staging/media/sunxi/cedrus/
 
-ALLWINNER DMIC DRIVERS
-M:     Ban Tao <fengzheng923@gmail.com>
-L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
-S:     Maintained
-F:     Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml
-F:     sound/soc/sunxi/sun50i-dmic.c
-
 ALPHA PORT
 M:     Richard Henderson <richard.henderson@linaro.org>
 M:     Ivan Kokshaysky <ink@jurassic.park.msu.ru>
@@ -1026,6 +1026,16 @@ F:       drivers/char/hw_random/geode-rng.c
 F:     drivers/crypto/geode*
 F:     drivers/video/fbdev/geode/
 
+AMD HSMP DRIVER
+M:     Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
+R:     Carlos Bilbao <carlos.bilbao@amd.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     Documentation/arch/x86/amd_hsmp.rst
+F:     arch/x86/include/asm/amd_hsmp.h
+F:     arch/x86/include/uapi/asm/amd_hsmp.h
+F:     drivers/platform/x86/amd/hsmp.c
+
 AMD IOMMU (AMD-VI)
 M:     Joerg Roedel <joro@8bytes.org>
 R:     Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
@@ -1049,6 +1059,13 @@ F:       drivers/gpu/drm/amd/include/vi_structs.h
 F:     include/uapi/linux/kfd_ioctl.h
 F:     include/uapi/linux/kfd_sysfs.h
 
+AMD MP2 I2C DRIVER
+M:     Elie Morisse <syniurge@gmail.com>
+M:     Shyam Sundar S K <shyam-sundar.s-k@amd.com>
+L:     linux-i2c@vger.kernel.org
+S:     Maintained
+F:     drivers/i2c/busses/i2c-amd-mp2*
+
 AMD PDS CORE DRIVER
 M:     Shannon Nelson <shannon.nelson@amd.com>
 M:     Brett Creeley <brett.creeley@amd.com>
@@ -1058,18 +1075,6 @@ F:       Documentation/networking/device_drivers/ethernet/amd/pds_core.rst
 F:     drivers/net/ethernet/amd/pds_core/
 F:     include/linux/pds/
 
-AMD SPI DRIVER
-M:     Sanjay R Mehta <sanju.mehta@amd.com>
-S:     Maintained
-F:     drivers/spi/spi-amd.c
-
-AMD MP2 I2C DRIVER
-M:     Elie Morisse <syniurge@gmail.com>
-M:     Shyam Sundar S K <shyam-sundar.s-k@amd.com>
-L:     linux-i2c@vger.kernel.org
-S:     Maintained
-F:     drivers/i2c/busses/i2c-amd-mp2*
-
 AMD PMC DRIVER
 M:     Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -1083,16 +1088,6 @@ S:       Maintained
 F:     Documentation/ABI/testing/sysfs-amd-pmf
 F:     drivers/platform/x86/amd/pmf/
 
-AMD HSMP DRIVER
-M:     Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
-R:     Carlos Bilbao <carlos.bilbao@amd.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-F:     Documentation/arch/x86/amd_hsmp.rst
-F:     arch/x86/include/asm/amd_hsmp.h
-F:     arch/x86/include/uapi/asm/amd_hsmp.h
-F:     drivers/platform/x86/amd/hsmp.c
-
 AMD POWERPLAY AND SWSMU
 M:     Evan Quan <evan.quan@amd.com>
 L:     amd-gfx@lists.freedesktop.org
@@ -1121,13 +1116,6 @@ M:       Tom Lendacky <thomas.lendacky@amd.com>
 S:     Supported
 F:     arch/arm64/boot/dts/amd/
 
-AMD XGBE DRIVER
-M:     "Shyam Sundar S K" <Shyam-sundar.S-k@amd.com>
-L:     netdev@vger.kernel.org
-S:     Supported
-F:     arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
-F:     drivers/net/ethernet/amd/xgbe/
-
 AMD SENSOR FUSION HUB DRIVER
 M:     Basavaraj Natikar <basavaraj.natikar@amd.com>
 L:     linux-input@vger.kernel.org
@@ -1135,6 +1123,18 @@ S:       Maintained
 F:     Documentation/hid/amd-sfh*
 F:     drivers/hid/amd-sfh-hid/
 
+AMD SPI DRIVER
+M:     Sanjay R Mehta <sanju.mehta@amd.com>
+S:     Maintained
+F:     drivers/spi/spi-amd.c
+
+AMD XGBE DRIVER
+M:     "Shyam Sundar S K" <Shyam-sundar.S-k@amd.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
+F:     drivers/net/ethernet/amd/xgbe/
+
 AMLOGIC DDR PMU DRIVER
 M:     Jiucheng Xu <jiucheng.xu@amlogic.com>
 L:     linux-amlogic@lists.infradead.org
@@ -1169,6 +1169,14 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
 F:     drivers/net/amt.c
 
+ANALOG DEVICES INC AD3552R DRIVER
+M:     Nuno Sá <nuno.sa@analog.com>
+L:     linux-iio@vger.kernel.org
+S:     Supported
+W:     https://ez.analog.com/linux-software-drivers
+F:     Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml
+F:     drivers/iio/dac/ad3552r.c
+
 ANALOG DEVICES INC AD4130 DRIVER
 M:     Cosmin Tanislav <cosmin.tanislav@analog.com>
 L:     linux-iio@vger.kernel.org
@@ -1194,14 +1202,6 @@ W:       https://ez.analog.com/linux-software-drivers
 F:     Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml
 F:     drivers/iio/adc/ad7292.c
 
-ANALOG DEVICES INC AD3552R DRIVER
-M:     Nuno Sá <nuno.sa@analog.com>
-L:     linux-iio@vger.kernel.org
-S:     Supported
-W:     https://ez.analog.com/linux-software-drivers
-F:     Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml
-F:     drivers/iio/dac/ad3552r.c
-
 ANALOG DEVICES INC AD7293 DRIVER
 M:     Antoniu Miclaus <antoniu.miclaus@analog.com>
 L:     linux-iio@vger.kernel.org
@@ -1210,23 +1210,6 @@ W:       https://ez.analog.com/linux-software-drivers
 F:     Documentation/devicetree/bindings/iio/dac/adi,ad7293.yaml
 F:     drivers/iio/dac/ad7293.c
 
-ANALOG DEVICES INC AD7768-1 DRIVER
-M:     Michael Hennerich <Michael.Hennerich@analog.com>
-L:     linux-iio@vger.kernel.org
-S:     Supported
-W:     https://ez.analog.com/linux-software-drivers
-F:     Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
-F:     drivers/iio/adc/ad7768-1.c
-
-ANALOG DEVICES INC AD7780 DRIVER
-M:     Michael Hennerich <Michael.Hennerich@analog.com>
-M:     Renato Lui Geh <renatogeh@gmail.com>
-L:     linux-iio@vger.kernel.org
-S:     Supported
-W:     https://ez.analog.com/linux-software-drivers
-F:     Documentation/devicetree/bindings/iio/adc/adi,ad7780.yaml
-F:     drivers/iio/adc/ad7780.c
-
 ANALOG DEVICES INC AD74115 DRIVER
 M:     Cosmin Tanislav <cosmin.tanislav@analog.com>
 L:     linux-iio@vger.kernel.org
@@ -1244,6 +1227,23 @@ F:       Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml
 F:     drivers/iio/addac/ad74413r.c
 F:     include/dt-bindings/iio/addac/adi,ad74413r.h
 
+ANALOG DEVICES INC AD7768-1 DRIVER
+M:     Michael Hennerich <Michael.Hennerich@analog.com>
+L:     linux-iio@vger.kernel.org
+S:     Supported
+W:     https://ez.analog.com/linux-software-drivers
+F:     Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
+F:     drivers/iio/adc/ad7768-1.c
+
+ANALOG DEVICES INC AD7780 DRIVER
+M:     Michael Hennerich <Michael.Hennerich@analog.com>
+M:     Renato Lui Geh <renatogeh@gmail.com>
+L:     linux-iio@vger.kernel.org
+S:     Supported
+W:     https://ez.analog.com/linux-software-drivers
+F:     Documentation/devicetree/bindings/iio/adc/adi,ad7780.yaml
+F:     drivers/iio/adc/ad7780.c
+
 ANALOG DEVICES INC ADA4250 DRIVER
 M:     Antoniu Miclaus <antoniu.miclaus@analog.com>
 L:     linux-iio@vger.kernel.org
@@ -1294,10 +1294,10 @@ F:      drivers/iio/imu/adis16460.c
 ANALOG DEVICES INC ADIS16475 DRIVER
 M:     Nuno Sa <nuno.sa@analog.com>
 L:     linux-iio@vger.kernel.org
-W:     https://ez.analog.com/linux-software-drivers
 S:     Supported
-F:     drivers/iio/imu/adis16475.c
+W:     https://ez.analog.com/linux-software-drivers
 F:     Documentation/devicetree/bindings/iio/imu/adi,adis16475.yaml
+F:     drivers/iio/imu/adis16475.c
 
 ANALOG DEVICES INC ADM1177 DRIVER
 M:     Michael Hennerich <Michael.Hennerich@analog.com>
@@ -1315,21 +1315,21 @@ W:      https://ez.analog.com/linux-software-drivers
 F:     Documentation/devicetree/bindings/iio/frequency/adi,admv1013.yaml
 F:     drivers/iio/frequency/admv1013.c
 
-ANALOG DEVICES INC ADMV8818 DRIVER
+ANALOG DEVICES INC ADMV1014 DRIVER
 M:     Antoniu Miclaus <antoniu.miclaus@analog.com>
 L:     linux-iio@vger.kernel.org
 S:     Supported
 W:     https://ez.analog.com/linux-software-drivers
-F:     Documentation/devicetree/bindings/iio/filter/adi,admv8818.yaml
-F:     drivers/iio/filter/admv8818.c
+F:     Documentation/devicetree/bindings/iio/frequency/adi,admv1014.yaml
+F:     drivers/iio/frequency/admv1014.c
 
-ANALOG DEVICES INC ADMV1014 DRIVER
+ANALOG DEVICES INC ADMV8818 DRIVER
 M:     Antoniu Miclaus <antoniu.miclaus@analog.com>
 L:     linux-iio@vger.kernel.org
 S:     Supported
 W:     https://ez.analog.com/linux-software-drivers
-F:     Documentation/devicetree/bindings/iio/frequency/adi,admv1014.yaml
-F:     drivers/iio/frequency/admv1014.c
+F:     Documentation/devicetree/bindings/iio/filter/adi,admv8818.yaml
+F:     drivers/iio/filter/admv8818.c
 
 ANALOG DEVICES INC ADP5061 DRIVER
 M:     Michael Hennerich <Michael.Hennerich@analog.com>
@@ -1351,8 +1351,8 @@ M:        Lars-Peter Clausen <lars@metafoo.de>
 L:     linux-media@vger.kernel.org
 S:     Supported
 W:     https://ez.analog.com/linux-software-drivers
-F:     drivers/media/i2c/adv7180.c
 F:     Documentation/devicetree/bindings/media/i2c/adv7180.yaml
+F:     drivers/media/i2c/adv7180.c
 
 ANALOG DEVICES INC ADV748X DRIVER
 M:     Kieran Bingham <kieran.bingham@ideasonboard.com>
@@ -1371,8 +1371,8 @@ ANALOG DEVICES INC ADV7604 DRIVER
 M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     drivers/media/i2c/adv7604*
 F:     Documentation/devicetree/bindings/media/i2c/adv7604.yaml
+F:     drivers/media/i2c/adv7604*
 
 ANALOG DEVICES INC ADV7842 DRIVER
 M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
@@ -1384,8 +1384,8 @@ ANALOG DEVICES INC ADXRS290 DRIVER
 M:     Nishant Malpani <nish.malpani25@gmail.com>
 L:     linux-iio@vger.kernel.org
 S:     Supported
-F:     drivers/iio/gyro/adxrs290.c
 F:     Documentation/devicetree/bindings/iio/gyroscope/adi,adxrs290.yaml
+F:     drivers/iio/gyro/adxrs290.c
 
 ANALOG DEVICES INC ASOC CODEC DRIVERS
 M:     Lars-Peter Clausen <lars@metafoo.de>
@@ -1625,6 +1625,17 @@ S:       Maintained
 F:     drivers/net/arcnet/
 F:     include/uapi/linux/if_arcnet.h
 
+ARM AND ARM64 SoC SUB-ARCHITECTURES (COMMON PARTS)
+M:     Arnd Bergmann <arnd@arndb.de>
+M:     Olof Johansson <olof@lixom.net>
+M:     soc@kernel.org
+L:     linux-arm-kernel@lists.infradead.org (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
+
 ARM ARCHITECTED TIMER DRIVER
 M:     Mark Rutland <mark.rutland@arm.com>
 M:     Marc Zyngier <maz@kernel.org>
@@ -1738,22 +1749,6 @@ S:       Odd Fixes
 F:     drivers/amba/
 F:     include/linux/amba/bus.h
 
-ARM PRIMECELL PL35X NAND CONTROLLER DRIVER
-M:     Miquel Raynal <miquel.raynal@bootlin.com>
-M:     Naga Sureshkumar Relli <nagasure@xilinx.com>
-L:     linux-mtd@lists.infradead.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml
-F:     drivers/mtd/nand/raw/pl35x-nand-controller.c
-
-ARM PRIMECELL PL35X SMC DRIVER
-M:     Miquel Raynal <miquel.raynal@bootlin.com>
-M:     Naga Sureshkumar Relli <nagasure@xilinx.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Maintained
-F:     Documentation/devicetree/bindings/memory-controllers/arm,pl35x-smc.yaml
-F:     drivers/memory/pl353-smc.c
-
 ARM PRIMECELL CLCD PL110 DRIVER
 M:     Russell King <linux@armlinux.org.uk>
 S:     Odd Fixes
@@ -1771,6 +1766,22 @@ S:       Odd Fixes
 F:     drivers/mmc/host/mmci.*
 F:     include/linux/amba/mmci.h
 
+ARM PRIMECELL PL35X NAND CONTROLLER DRIVER
+M:     Miquel Raynal <miquel.raynal@bootlin.com>
+M:     Naga Sureshkumar Relli <nagasure@xilinx.com>
+L:     linux-mtd@lists.infradead.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml
+F:     drivers/mtd/nand/raw/pl35x-nand-controller.c
+
+ARM PRIMECELL PL35X SMC DRIVER
+M:     Miquel Raynal <miquel.raynal@bootlin.com>
+M:     Naga Sureshkumar Relli <nagasure@xilinx.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/memory-controllers/arm,pl35x-smc.yaml
+F:     drivers/memory/pl353-smc.c
+
 ARM PRIMECELL SSP PL022 SPI DRIVER
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1807,17 +1818,6 @@ F:       Documentation/devicetree/bindings/iommu/arm,smmu*
 F:     drivers/iommu/arm/
 F:     drivers/iommu/io-pgtable-arm*
 
-ARM AND ARM64 SoC SUB-ARCHITECTURES (COMMON PARTS)
-M:     Arnd Bergmann <arnd@arndb.de>
-M:     Olof Johansson <olof@lixom.net>
-M:     soc@kernel.org
-L:     linux-arm-kernel@lists.infradead.org (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
-
 ARM SUB-ARCHITECTURES
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -1869,9 +1869,9 @@ M:        Chen-Yu Tsai <wens@csie.org>
 M:     Jernej Skrabec <jernej.skrabec@gmail.com>
 M:     Samuel Holland <samuel@sholland.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-sunxi@lists.linux.dev
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
-L:     linux-sunxi@lists.linux.dev
 F:     arch/arm/mach-sunxi/
 F:     arch/arm64/boot/dts/allwinner/
 F:     drivers/clk/sunxi-ng/
@@ -1934,6 +1934,15 @@ F:       arch/arm/mach-alpine/
 F:     arch/arm64/boot/dts/amazon/
 F:     drivers/*/*alpine*
 
+ARM/APPLE MACHINE SOUND DRIVERS
+M:     Martin PoviÅ¡er <povik+lin@cutebit.org>
+L:     asahi@lists.linux.dev
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/sound/apple,*
+F:     sound/soc/apple/*
+F:     sound/soc/codecs/cs42l83-i2c.c
+
 ARM/APPLE MACHINE SUPPORT
 M:     Hector Martin <marcan@marcan.st>
 M:     Sven Peter <sven@svenpeter.dev>
@@ -1961,7 +1970,7 @@ F:        Documentation/devicetree/bindings/nvmem/apple,efuses.yaml
 F:     Documentation/devicetree/bindings/pci/apple,pcie.yaml
 F:     Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
 F:     Documentation/devicetree/bindings/power/apple*
-F:     Documentation/devicetree/bindings/pwm/pwm-apple.yaml
+F:     Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml
 F:     Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
 F:     arch/arm64/boot/dts/apple/
 F:     drivers/bluetooth/hci_bcm4377.c
@@ -1985,15 +1994,6 @@ F:       include/dt-bindings/pinctrl/apple.h
 F:     include/linux/apple-mailbox.h
 F:     include/linux/soc/apple/*
 
-ARM/APPLE MACHINE SOUND DRIVERS
-M:     Martin PoviÅ¡er <povik+lin@cutebit.org>
-L:     asahi@lists.linux.dev
-L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
-S:     Maintained
-F:     Documentation/devicetree/bindings/sound/apple,*
-F:     sound/soc/apple/*
-F:     sound/soc/codecs/cs42l83-i2c.c
-
 ARM/ARTPEC MACHINE SUPPORT
 M:     Jesper Nilsson <jesper.nilsson@axis.com>
 M:     Lars Persson <lars.persson@axis.com>
@@ -2109,19 +2109,19 @@ S:      Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git
 F:     Documentation/ABI/testing/sysfs-bus-coresight-devices-*
 F:     Documentation/devicetree/bindings/arm/arm,coresight-*.yaml
-F:     Documentation/devicetree/bindings/arm/qcom,coresight-*.yaml
 F:     Documentation/devicetree/bindings/arm/arm,embedded-trace-extension.yaml
 F:     Documentation/devicetree/bindings/arm/arm,trace-buffer-extension.yaml
+F:     Documentation/devicetree/bindings/arm/qcom,coresight-*.yaml
 F:     Documentation/trace/coresight/*
 F:     drivers/hwtracing/coresight/*
 F:     include/dt-bindings/arm/coresight-cti-dt.h
 F:     include/linux/coresight*
 F:     samples/coresight/*
-F:     tools/perf/tests/shell/coresight/*
 F:     tools/perf/arch/arm/util/auxtrace.c
 F:     tools/perf/arch/arm/util/cs-etm.c
 F:     tools/perf/arch/arm/util/cs-etm.h
 F:     tools/perf/arch/arm/util/pmu.c
+F:     tools/perf/tests/shell/coresight/*
 F:     tools/perf/util/cs-etm-decoder/*
 F:     tools/perf/util/cs-etm.*
 
@@ -2156,9 +2156,9 @@ F:        Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml
 F:     Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt
 F:     drivers/bus/moxtet.c
 F:     drivers/firmware/turris-mox-rwtm.c
+F:     drivers/gpio/gpio-moxtet.c
 F:     drivers/leds/leds-turris-omnia.c
 F:     drivers/mailbox/armada-37xx-rwtm-mailbox.c
-F:     drivers/gpio/gpio-moxtet.c
 F:     drivers/watchdog/armada_37xx_wdt.c
 F:     include/dt-bindings/bus/moxtet.h
 F:     include/linux/armada-37xx-rwtm-mailbox.h
@@ -2188,10 +2188,10 @@ R:      NXP Linux Team <linux-imx@nxp.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
-X:     drivers/media/i2c/
 F:     arch/arm64/boot/dts/freescale/
 X:     arch/arm64/boot/dts/freescale/fsl-*
 X:     arch/arm64/boot/dts/freescale/qoriq-*
+X:     drivers/media/i2c/
 N:     imx
 N:     mxs
 
@@ -2245,12 +2245,12 @@ ARM/HPE GXP ARCHITECTURE
 M:     Jean-Marie Verdun <verdun@hpe.com>
 M:     Nick Hawkins <nick.hawkins@hpe.com>
 S:     Maintained
-F:     Documentation/hwmon/gxp-fan-ctrl.rst
 F:     Documentation/devicetree/bindings/arm/hpe,gxp.yaml
 F:     Documentation/devicetree/bindings/hwmon/hpe,gxp-fan-ctrl.yaml
 F:     Documentation/devicetree/bindings/i2c/hpe,gxp-i2c.yaml
 F:     Documentation/devicetree/bindings/spi/hpe,gxp-spifi.yaml
 F:     Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
+F:     Documentation/hwmon/gxp-fan-ctrl.rst
 F:     arch/arm/boot/dts/hpe-bmc*
 F:     arch/arm/boot/dts/hpe-gxp*
 F:     arch/arm/mach-hpe/
@@ -2275,9 +2275,9 @@ 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/memory-controllers/intel,ixp4xx-expansion*
 F:     Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt
 F:     Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
+F:     Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion*
 F:     Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
 F:     arch/arm/boot/dts/intel-ixp*
 F:     arch/arm/mach-ixp4xx/
@@ -2447,13 +2447,6 @@ F:       drivers/net/ethernet/microchip/vcap/
 F:     drivers/pinctrl/pinctrl-microchip-sgpio.c
 N:     sparx5
 
-Microchip Timer Counter Block (TCB) Capture Driver
-M:     Kamel Bouhara <kamel.bouhara@bootlin.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-L:     linux-iio@vger.kernel.org
-S:     Maintained
-F:     drivers/counter/microchip-tcb-capture.c
-
 ARM/MILBEAUT ARCHITECTURE
 M:     Taichi Sugaya <sugaya.taichi@socionext.com>
 M:     Takao Orito <orito.takao@socionext.com>
@@ -2525,8 +2518,8 @@ F:        Documentation/devicetree/bindings/rtc/nuvoton,nct3018y.yaml
 F:     arch/arm/boot/dts/nuvoton-npcm*
 F:     arch/arm/mach-npcm/
 F:     arch/arm64/boot/dts/nuvoton/
-F:     drivers/*/*npcm*
 F:     drivers/*/*/*npcm*
+F:     drivers/*/*npcm*
 F:     drivers/rtc/rtc-nct3018y.c
 F:     include/dt-bindings/clock/nuvoton,npcm7xx-clock.h
 F:     include/dt-bindings/clock/nuvoton,npcm845-clk.h
@@ -2569,9 +2562,15 @@ F:       arch/arm/mach-oxnas/
 F:     drivers/power/reset/oxnas-restart.c
 N:     oxnas
 
-ARM/QUALCOMM SUPPORT
-M:     Andy Gross <agross@kernel.org>
-M:     Bjorn Andersson <andersson@kernel.org>
+ARM/QUALCOMM CHROMEBOOK SUPPORT
+R:     cros-qcom-dts-watchers@chromium.org
+F:     arch/arm64/boot/dts/qcom/sc7180*
+F:     arch/arm64/boot/dts/qcom/sc7280*
+F:     arch/arm64/boot/dts/qcom/sdm845-cheza*
+
+ARM/QUALCOMM SUPPORT
+M:     Andy Gross <agross@kernel.org>
+M:     Bjorn Andersson <andersson@kernel.org>
 R:     Konrad Dybcio <konrad.dybcio@linaro.org>
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
@@ -2602,22 +2601,16 @@ F:      drivers/pci/controller/dwc/pcie-qcom.c
 F:     drivers/phy/qualcomm/
 F:     drivers/power/*/msm*
 F:     drivers/reset/reset-qcom-*
-F:     drivers/ufs/host/ufs-qcom*
 F:     drivers/spi/spi-geni-qcom.c
 F:     drivers/spi/spi-qcom-qspi.c
 F:     drivers/spi/spi-qup.c
 F:     drivers/tty/serial/msm_serial.c
+F:     drivers/ufs/host/ufs-qcom*
 F:     drivers/usb/dwc3/dwc3-qcom.c
 F:     include/dt-bindings/*/qcom*
 F:     include/linux/*/qcom*
 F:     include/linux/soc/qcom/
 
-ARM/QUALCOMM CHROMEBOOK SUPPORT
-R:     cros-qcom-dts-watchers@chromium.org
-F:     arch/arm64/boot/dts/qcom/sc7180*
-F:     arch/arm64/boot/dts/qcom/sc7280*
-F:     arch/arm64/boot/dts/qcom/sdm845-cheza*
-
 ARM/RDA MICRO ARCHITECTURE
 M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -2709,9 +2702,9 @@ R:        Alim Akhtar <alim.akhtar@samsung.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-samsung-soc@vger.kernel.org
 S:     Maintained
-C:     irc://irc.libera.chat/linux-exynos
 Q:     https://patchwork.kernel.org/project/linux-samsung-soc/list/
 B:     mailto:linux-samsung-soc@vger.kernel.org
+C:     irc://irc.libera.chat/linux-exynos
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
 F:     Documentation/arm/samsung/
 F:     Documentation/devicetree/bindings/arm/samsung/
@@ -2811,8 +2804,8 @@ M:        Patrice Chotard <patrice.chotard@foss.st.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 W:     http://www.stlinux.com
-F:     Documentation/devicetree/bindings/spi/st,ssc-spi.yaml
 F:     Documentation/devicetree/bindings/i2c/st,sti-i2c.yaml
+F:     Documentation/devicetree/bindings/spi/st,ssc-spi.yaml
 F:     arch/arm/boot/dts/sti*
 F:     arch/arm/mach-sti/
 F:     drivers/ata/ahci_st.c
@@ -2959,15 +2952,15 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti.git
 F:     Documentation/devicetree/bindings/arm/toshiba.yaml
 F:     Documentation/devicetree/bindings/clock/toshiba,tmpv770x-pipllct.yaml
 F:     Documentation/devicetree/bindings/clock/toshiba,tmpv770x-pismu.yaml
-F:     Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
 F:     Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml
+F:     Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
 F:     Documentation/devicetree/bindings/pci/toshiba,visconti-pcie.yaml
 F:     Documentation/devicetree/bindings/pinctrl/toshiba,visconti-pinctrl.yaml
 F:     Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
 F:     arch/arm64/boot/dts/toshiba/
 F:     drivers/clk/visconti/
-F:     drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
 F:     drivers/gpio/gpio-visconti.c
+F:     drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
 F:     drivers/pci/controller/dwc/pcie-visconti.c
 F:     drivers/pinctrl/visconti/
 F:     drivers/watchdog/visconti_wdt.c
@@ -3112,6 +3105,13 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/net/asix,ax88796c.yaml
 F:     drivers/net/ethernet/asix/ax88796c_*
 
+ASPEED CRYPTO DRIVER
+M:     Neal Liu <neal_liu@aspeedtech.com>
+L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/crypto/aspeed,*
+F:     drivers/crypto/aspeed/
+
 ASPEED PECI CONTROLLER
 M:     Iwona Winiarska <iwona.winiarska@intel.com>
 L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
@@ -3156,6 +3156,13 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/spi/aspeed,ast2600-fmc.yaml
 F:     drivers/spi/spi-aspeed-smc.c
 
+ASPEED USB UDC DRIVER
+M:     Neal Liu <neal_liu@aspeedtech.com>
+L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/usb/aspeed,ast2600-udc.yaml
+F:     drivers/usb/gadget/udc/aspeed_udc.c
+
 ASPEED VIDEO ENGINE DRIVER
 M:     Eddie James <eajames@linux.ibm.com>
 L:     linux-media@vger.kernel.org
@@ -3164,19 +3171,11 @@ S:      Maintained
 F:     Documentation/devicetree/bindings/media/aspeed-video.txt
 F:     drivers/media/platform/aspeed/
 
-ASPEED USB UDC DRIVER
-M:     Neal Liu <neal_liu@aspeedtech.com>
-L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
-S:     Maintained
-F:     Documentation/devicetree/bindings/usb/aspeed,ast2600-udc.yaml
-F:     drivers/usb/gadget/udc/aspeed_udc.c
-
-ASPEED CRYPTO DRIVER
-M:     Neal Liu <neal_liu@aspeedtech.com>
-L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
+ASUS EC HARDWARE MONITOR DRIVER
+M:     Eugene Shalygin <eugene.shalygin@gmail.com>
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/crypto/aspeed,*
-F:     drivers/crypto/aspeed/
+F:     drivers/hwmon/asus-ec-sensors.c
 
 ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
 M:     Corentin Chary <corentin.chary@gmail.com>
@@ -3194,6 +3193,12 @@ S:       Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
 F:     drivers/platform/x86/asus-tf103c-dock.c
 
+ASUS WIRELESS RADIO CONTROL DRIVER
+M:     João Paulo Rechi Vita <jprvita@gmail.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/platform/x86/asus-wireless.c
+
 ASUS WMI HARDWARE MONITOR DRIVER
 M:     Ed Brindley <kernel@maidavale.org>
 M:     Denis Pauk <pauk.denis@gmail.com>
@@ -3201,18 +3206,6 @@ L:       linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     drivers/hwmon/asus_wmi_sensors.c
 
-ASUS EC HARDWARE MONITOR DRIVER
-M:     Eugene Shalygin <eugene.shalygin@gmail.com>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     drivers/hwmon/asus-ec-sensors.c
-
-ASUS WIRELESS RADIO CONTROL DRIVER
-M:     João Paulo Rechi Vita <jprvita@gmail.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-F:     drivers/platform/x86/asus-wireless.c
-
 ASYMMETRIC KEYS
 M:     David Howells <dhowells@redhat.com>
 L:     keyrings@vger.kernel.org
@@ -3352,10 +3345,10 @@ R:      Boqun Feng <boqun.feng@gmail.com>
 R:     Mark Rutland <mark.rutland@arm.com>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
+F:     Documentation/atomic_*.txt
 F:     arch/*/include/asm/atomic*.h
 F:     include/*/atomic*.h
 F:     include/linux/refcount.h
-F:     Documentation/atomic_*.txt
 F:     scripts/atomic/
 
 ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
@@ -3649,50 +3642,6 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml
 F:     drivers/iio/accel/bma400*
 
-BPF [GENERAL] (Safe Dynamic Programs and Tools)
-M:     Alexei Starovoitov <ast@kernel.org>
-M:     Daniel Borkmann <daniel@iogearbox.net>
-M:     Andrii Nakryiko <andrii@kernel.org>
-R:     Martin KaFai Lau <martin.lau@linux.dev>
-R:     Song Liu <song@kernel.org>
-R:     Yonghong Song <yhs@fb.com>
-R:     John Fastabend <john.fastabend@gmail.com>
-R:     KP Singh <kpsingh@kernel.org>
-R:     Stanislav Fomichev <sdf@google.com>
-R:     Hao Luo <haoluo@google.com>
-R:     Jiri Olsa <jolsa@kernel.org>
-L:     bpf@vger.kernel.org
-S:     Supported
-W:     https://bpf.io/
-Q:     https://patchwork.kernel.org/project/netdevbpf/list/?delegate=121173
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
-F:     Documentation/bpf/
-F:     Documentation/networking/filter.rst
-F:     Documentation/userspace-api/ebpf/
-F:     arch/*/net/*
-F:     include/linux/bpf*
-F:     include/linux/btf*
-F:     include/linux/filter.h
-F:     include/trace/events/xdp.h
-F:     include/uapi/linux/bpf*
-F:     include/uapi/linux/btf*
-F:     include/uapi/linux/filter.h
-F:     kernel/bpf/
-F:     kernel/trace/bpf_trace.c
-F:     lib/test_bpf.c
-F:     net/bpf/
-F:     net/core/filter.c
-F:     net/sched/act_bpf.c
-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/
-
 BPF JIT for ARM
 M:     Shubham Bansal <illusionist.neo@gmail.com>
 L:     bpf@vger.kernel.org
@@ -3771,79 +3720,79 @@ S:      Supported
 F:     arch/x86/net/
 X:     arch/x86/net/bpf_jit_comp32.c
 
+BPF [BTF]
+M:     Martin KaFai Lau <martin.lau@linux.dev>
+L:     bpf@vger.kernel.org
+S:     Maintained
+F:     include/linux/btf*
+F:     kernel/bpf/btf.c
+
 BPF [CORE]
 M:     Alexei Starovoitov <ast@kernel.org>
 M:     Daniel Borkmann <daniel@iogearbox.net>
 R:     John Fastabend <john.fastabend@gmail.com>
 L:     bpf@vger.kernel.org
 S:     Maintained
-F:     kernel/bpf/verifier.c
-F:     kernel/bpf/tnum.c
-F:     kernel/bpf/core.c
-F:     kernel/bpf/syscall.c
-F:     kernel/bpf/dispatcher.c
-F:     kernel/bpf/trampoline.c
 F:     include/linux/bpf*
 F:     include/linux/filter.h
 F:     include/linux/tnum.h
+F:     kernel/bpf/core.c
+F:     kernel/bpf/dispatcher.c
+F:     kernel/bpf/syscall.c
+F:     kernel/bpf/tnum.c
+F:     kernel/bpf/trampoline.c
+F:     kernel/bpf/verifier.c
 
-BPF [BTF]
-M:     Martin KaFai Lau <martin.lau@linux.dev>
-L:     bpf@vger.kernel.org
-S:     Maintained
-F:     kernel/bpf/btf.c
-F:     include/linux/btf*
-
-BPF [TRACING]
-M:     Song Liu <song@kernel.org>
-R:     Jiri Olsa <jolsa@kernel.org>
+BPF [DOCUMENTATION] (Related to Standardization)
+R:     David Vernet <void@manifault.com>
 L:     bpf@vger.kernel.org
+L:     bpf@ietf.org
 S:     Maintained
-F:     kernel/trace/bpf_trace.c
-F:     kernel/bpf/stackmap.c
+F:     Documentation/bpf/instruction-set.rst
 
-BPF [NETWORKING] (tc BPF, sock_addr)
-M:     Martin KaFai Lau <martin.lau@linux.dev>
+BPF [GENERAL] (Safe Dynamic Programs and Tools)
+M:     Alexei Starovoitov <ast@kernel.org>
 M:     Daniel Borkmann <daniel@iogearbox.net>
+M:     Andrii Nakryiko <andrii@kernel.org>
+R:     Martin KaFai Lau <martin.lau@linux.dev>
+R:     Song Liu <song@kernel.org>
+R:     Yonghong Song <yhs@fb.com>
 R:     John Fastabend <john.fastabend@gmail.com>
+R:     KP Singh <kpsingh@kernel.org>
+R:     Stanislav Fomichev <sdf@google.com>
+R:     Hao Luo <haoluo@google.com>
+R:     Jiri Olsa <jolsa@kernel.org>
 L:     bpf@vger.kernel.org
-L:     netdev@vger.kernel.org
-S:     Maintained
+S:     Supported
+W:     https://bpf.io/
+Q:     https://patchwork.kernel.org/project/netdevbpf/list/?delegate=121173
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
+F:     Documentation/bpf/
+F:     Documentation/networking/filter.rst
+F:     Documentation/userspace-api/ebpf/
+F:     arch/*/net/*
+F:     include/linux/bpf*
+F:     include/linux/btf*
+F:     include/linux/filter.h
+F:     include/trace/events/xdp.h
+F:     include/uapi/linux/bpf*
+F:     include/uapi/linux/btf*
+F:     include/uapi/linux/filter.h
+F:     kernel/bpf/
+F:     kernel/trace/bpf_trace.c
+F:     lib/test_bpf.c
+F:     net/bpf/
 F:     net/core/filter.c
 F:     net/sched/act_bpf.c
 F:     net/sched/cls_bpf.c
-
-BPF [NETWORKING] (struct_ops, reuseport)
-M:     Martin KaFai Lau <martin.lau@linux.dev>
-L:     bpf@vger.kernel.org
-L:     netdev@vger.kernel.org
-S:     Maintained
-F:     kernel/bpf/bpf_struct*
-
-BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)
-M:     KP Singh <kpsingh@kernel.org>
-R:     Florent Revest <revest@chromium.org>
-R:     Brendan Jackman <jackmanb@chromium.org>
-L:     bpf@vger.kernel.org
-S:     Maintained
-F:     Documentation/bpf/prog_lsm.rst
-F:     include/linux/bpf_lsm.h
-F:     kernel/bpf/bpf_lsm.c
-F:     security/bpf/
-
-BPF [STORAGE & CGROUPS]
-M:     Martin KaFai Lau <martin.lau@linux.dev>
-L:     bpf@vger.kernel.org
-S:     Maintained
-F:     kernel/bpf/cgroup.c
-F:     kernel/bpf/*storage.c
-F:     kernel/bpf/bpf_lru*
-
-BPF [RINGBUF]
-M:     Andrii Nakryiko <andrii@kernel.org>
-L:     bpf@vger.kernel.org
-S:     Maintained
-F:     kernel/bpf/ringbuf.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/
 
 BPF [ITERATOR]
 M:     Yonghong Song <yhs@fb.com>
@@ -3870,12 +3819,45 @@ L:      bpf@vger.kernel.org
 S:     Maintained
 F:     tools/lib/bpf/
 
-BPF [TOOLING] (bpftool)
-M:     Quentin Monnet <quentin@isovalent.com>
+BPF [MISC]
+L:     bpf@vger.kernel.org
+S:     Odd Fixes
+K:     (?:\b|_)bpf(?:\b|_)
+
+BPF [NETWORKING] (struct_ops, reuseport)
+M:     Martin KaFai Lau <martin.lau@linux.dev>
 L:     bpf@vger.kernel.org
+L:     netdev@vger.kernel.org
 S:     Maintained
-F:     kernel/bpf/disasm.*
-F:     tools/bpf/bpftool/
+F:     kernel/bpf/bpf_struct*
+
+BPF [NETWORKING] (tc BPF, sock_addr)
+M:     Martin KaFai Lau <martin.lau@linux.dev>
+M:     Daniel Borkmann <daniel@iogearbox.net>
+R:     John Fastabend <john.fastabend@gmail.com>
+L:     bpf@vger.kernel.org
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     net/core/filter.c
+F:     net/sched/act_bpf.c
+F:     net/sched/cls_bpf.c
+
+BPF [RINGBUF]
+M:     Andrii Nakryiko <andrii@kernel.org>
+L:     bpf@vger.kernel.org
+S:     Maintained
+F:     kernel/bpf/ringbuf.c
+
+BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)
+M:     KP Singh <kpsingh@kernel.org>
+R:     Florent Revest <revest@chromium.org>
+R:     Brendan Jackman <jackmanb@chromium.org>
+L:     bpf@vger.kernel.org
+S:     Maintained
+F:     Documentation/bpf/prog_lsm.rst
+F:     include/linux/bpf_lsm.h
+F:     kernel/bpf/bpf_lsm.c
+F:     security/bpf/
 
 BPF [SELFTESTS] (Test Runners & Infrastructure)
 M:     Andrii Nakryiko <andrii@kernel.org>
@@ -3884,17 +3866,28 @@ L:      bpf@vger.kernel.org
 S:     Maintained
 F:     tools/testing/selftests/bpf/
 
-BPF [DOCUMENTATION] (Related to Standardization)
-R:     David Vernet <void@manifault.com>
+BPF [STORAGE & CGROUPS]
+M:     Martin KaFai Lau <martin.lau@linux.dev>
 L:     bpf@vger.kernel.org
-L:     bpf@ietf.org
 S:     Maintained
-F:     Documentation/bpf/instruction-set.rst
+F:     kernel/bpf/*storage.c
+F:     kernel/bpf/bpf_lru*
+F:     kernel/bpf/cgroup.c
 
-BPF [MISC]
+BPF [TOOLING] (bpftool)
+M:     Quentin Monnet <quentin@isovalent.com>
 L:     bpf@vger.kernel.org
-S:     Odd Fixes
-K:     (?:\b|_)bpf(?:\b|_)
+S:     Maintained
+F:     kernel/bpf/disasm.*
+F:     tools/bpf/bpftool/
+
+BPF [TRACING]
+M:     Song Liu <song@kernel.org>
+R:     Jiri Olsa <jolsa@kernel.org>
+L:     bpf@vger.kernel.org
+S:     Maintained
+F:     kernel/bpf/stackmap.c
+F:     kernel/trace/bpf_trace.c
 
 BROADCOM B44 10/100 ETHERNET DRIVER
 M:     Michael Chan <michael.chan@broadcom.com>
@@ -3913,34 +3906,6 @@ F:       drivers/net/dsa/bcm_sf2*
 F:     include/linux/dsa/brcm.h
 F:     include/linux/platform_data/b53.h
 
-BROADCOM BCMBCA ARM ARCHITECTURE
-M:     William Zhang <william.zhang@broadcom.com>
-M:     Anand Gore <anand.gore@broadcom.com>
-M:     Kursad Oney <kursad.oney@broadcom.com>
-M:     Florian Fainelli <f.fainelli@gmail.com>
-M:     RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
-R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Maintained
-T:     git https://github.com/broadcom/stblinux.git
-F:     Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
-F:     arch/arm64/boot/dts/broadcom/bcmbca/*
-N:     bcmbca
-N:     bcm[9]?47622
-N:     bcm[9]?4912
-N:     bcm[9]?63138
-N:     bcm[9]?63146
-N:     bcm[9]?63148
-N:     bcm[9]?63158
-N:     bcm[9]?63178
-N:     bcm[9]?6756
-N:     bcm[9]?6813
-N:     bcm[9]?6846
-N:     bcm[9]?6855
-N:     bcm[9]?6856
-N:     bcm[9]?6858
-N:     bcm[9]?6878
-
 BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
 M:     Florian Fainelli <f.fainelli@gmail.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
@@ -4038,11 +4003,39 @@ N:      brcmstb
 N:     bcm7038
 N:     bcm7120
 
+BROADCOM BCMBCA ARM ARCHITECTURE
+M:     William Zhang <william.zhang@broadcom.com>
+M:     Anand Gore <anand.gore@broadcom.com>
+M:     Kursad Oney <kursad.oney@broadcom.com>
+M:     Florian Fainelli <f.fainelli@gmail.com>
+M:     RafaÅ‚ MiÅ‚ecki <rafal@milecki.pl>
+R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+T:     git https://github.com/broadcom/stblinux.git
+F:     Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
+F:     arch/arm64/boot/dts/broadcom/bcmbca/*
+N:     bcmbca
+N:     bcm[9]?47622
+N:     bcm[9]?4912
+N:     bcm[9]?63138
+N:     bcm[9]?63146
+N:     bcm[9]?63148
+N:     bcm[9]?63158
+N:     bcm[9]?63178
+N:     bcm[9]?6756
+N:     bcm[9]?6813
+N:     bcm[9]?6846
+N:     bcm[9]?6855
+N:     bcm[9]?6856
+N:     bcm[9]?6858
+N:     bcm[9]?6878
+
 BROADCOM BDC DRIVER
 M:     Justin Chen <justinpopo6@gmail.com>
 M:     Al Cooper <alcooperx@gmail.com>
-L:     linux-usb@vger.kernel.org
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
+L:     linux-usb@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/usb/brcm,bdc.yaml
 F:     drivers/usb/gadget/udc/bdc/
@@ -4064,10 +4057,10 @@ F:      arch/mips/bmips/*
 F:     arch/mips/boot/dts/brcm/bcm*.dts*
 F:     arch/mips/include/asm/mach-bmips/*
 F:     arch/mips/kernel/*bmips*
-F:     drivers/soc/bcm/bcm63xx
 F:     drivers/irqchip/irq-bcm63*
 F:     drivers/irqchip/irq-bcm7*
 F:     drivers/irqchip/irq-brcmstb*
+F:     drivers/soc/bcm/bcm63xx
 F:     include/linux/bcm963xx_nvram.h
 F:     include/linux/bcm963xx_tag.h
 
@@ -4349,9 +4342,9 @@ M:        Florian Fainelli <f.fainelli@gmail.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     netdev@vger.kernel.org
 S:     Supported
+F:     Documentation/devicetree/bindings/net/brcm,systemport.yaml
 F:     drivers/net/ethernet/broadcom/bcmsysport.*
 F:     drivers/net/ethernet/broadcom/unimac.h
-F:     Documentation/devicetree/bindings/net/brcm,systemport.yaml
 
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
 M:     Siva Reddy Kallam <siva.kallam@broadcom.com>
@@ -4483,29 +4476,6 @@ W:       https://github.com/Cascoda/ca8210-linux.git
 F:     Documentation/devicetree/bindings/net/ieee802154/ca8210.txt
 F:     drivers/net/ieee802154/ca8210.c
 
-CANAAN/KENDRYTE K210 SOC FPIOA DRIVER
-M:     Damien Le Moal <dlemoal@kernel.org>
-L:     linux-riscv@lists.infradead.org
-L:     linux-gpio@vger.kernel.org (pinctrl driver)
-F:     Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml
-F:     drivers/pinctrl/pinctrl-k210.c
-
-CANAAN/KENDRYTE K210 SOC RESET CONTROLLER DRIVER
-M:     Damien Le Moal <dlemoal@kernel.org>
-L:     linux-kernel@vger.kernel.org
-L:     linux-riscv@lists.infradead.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/reset/canaan,k210-rst.yaml
-F:     drivers/reset/reset-k210.c
-
-CANAAN/KENDRYTE K210 SOC SYSTEM CONTROLLER DRIVER
-M:     Damien Le Moal <dlemoal@kernel.org>
-L:     linux-riscv@lists.infradead.org
-S:     Maintained
-F:      Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml
-F:     drivers/soc/canaan/
-F:     include/soc/canaan/
-
 CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
 M:     David Howells <dhowells@redhat.com>
 L:     linux-cachefs@redhat.com (moderated for non-subscribers)
@@ -4627,6 +4597,29 @@ F:       Documentation/networking/j1939.rst
 F:     include/uapi/linux/can/j1939.h
 F:     net/can/j1939/
 
+CANAAN/KENDRYTE K210 SOC FPIOA DRIVER
+M:     Damien Le Moal <dlemoal@kernel.org>
+L:     linux-riscv@lists.infradead.org
+L:     linux-gpio@vger.kernel.org (pinctrl driver)
+F:     Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml
+F:     drivers/pinctrl/pinctrl-k210.c
+
+CANAAN/KENDRYTE K210 SOC RESET CONTROLLER DRIVER
+M:     Damien Le Moal <dlemoal@kernel.org>
+L:     linux-kernel@vger.kernel.org
+L:     linux-riscv@lists.infradead.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/reset/canaan,k210-rst.yaml
+F:     drivers/reset/reset-k210.c
+
+CANAAN/KENDRYTE K210 SOC SYSTEM CONTROLLER DRIVER
+M:     Damien Le Moal <dlemoal@kernel.org>
+L:     linux-riscv@lists.infradead.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml
+F:     drivers/soc/canaan/
+F:     include/soc/canaan/
+
 CAPABILITIES
 M:     Serge Hallyn <serge@hallyn.com>
 L:     linux-security-module@vger.kernel.org
@@ -4686,8 +4679,8 @@ F:        arch/arm64/boot/dts/cavium/thunder2-99xx*
 
 CBS/ETF/TAPRIO QDISCS
 M:     Vinicius Costa Gomes <vinicius.gomes@intel.com>
-S:     Maintained
 L:     netdev@vger.kernel.org
+S:     Maintained
 F:     net/sched/sch_cbs.c
 F:     net/sched/sch_etf.c
 F:     net/sched/sch_taprio.c
@@ -4710,10 +4703,10 @@ CCTRNG ARM TRUSTZONE CRYPTOCELL TRUE RANDOM NUMBER GENERATOR (TRNG) DRIVER
 M:     Hadar Gat <hadar.gat@arm.com>
 L:     linux-crypto@vger.kernel.org
 S:     Supported
+W:     https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
+F:     Documentation/devicetree/bindings/rng/arm-cctrng.yaml
 F:     drivers/char/hw_random/cctrng.c
 F:     drivers/char/hw_random/cctrng.h
-F:     Documentation/devicetree/bindings/rng/arm-cctrng.yaml
-W:     https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
 
 CEC FRAMEWORK
 M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
@@ -4873,13 +4866,6 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
 F:     sound/soc/codecs/cros_ec_codec.*
 
-CHROMEOS EC UART DRIVER
-M:     Bhanu Prakash Maiya <bhanumaiya@chromium.org>
-R:     Benson Leung <bleung@chromium.org>
-R:     Tzung-Bi Shih <tzungbi@kernel.org>
-S:     Maintained
-F:     drivers/platform/chrome/cros_ec_uart.c
-
 CHROMEOS EC SUBDRIVERS
 M:     Benson Leung <bleung@chromium.org>
 R:     Guenter Roeck <groeck@chromium.org>
@@ -4889,13 +4875,12 @@ F:      drivers/power/supply/cros_usbpd-charger.c
 N:     cros_ec
 N:     cros-ec
 
-CHROMEOS EC USB TYPE-C DRIVER
-M:     Prashant Malani <pmalani@chromium.org>
-L:     chrome-platform@lists.linux.dev
+CHROMEOS EC UART DRIVER
+M:     Bhanu Prakash Maiya <bhanumaiya@chromium.org>
+R:     Benson Leung <bleung@chromium.org>
+R:     Tzung-Bi Shih <tzungbi@kernel.org>
 S:     Maintained
-F:     drivers/platform/chrome/cros_ec_typec.*
-F:     drivers/platform/chrome/cros_typec_switch.c
-F:     drivers/platform/chrome/cros_typec_vdm.*
+F:     drivers/platform/chrome/cros_ec_uart.c
 
 CHROMEOS EC USB PD NOTIFY DRIVER
 M:     Prashant Malani <pmalani@chromium.org>
@@ -4904,6 +4889,14 @@ S:       Maintained
 F:     drivers/platform/chrome/cros_usbpd_notify.c
 F:     include/linux/platform_data/cros_usbpd_notify.h
 
+CHROMEOS EC USB TYPE-C DRIVER
+M:     Prashant Malani <pmalani@chromium.org>
+L:     chrome-platform@lists.linux.dev
+S:     Maintained
+F:     drivers/platform/chrome/cros_ec_typec.*
+F:     drivers/platform/chrome/cros_typec_switch.c
+F:     drivers/platform/chrome/cros_typec_vdm.*
+
 CHROMEOS HPS DRIVER
 M:     Dan Callaghan <dcallagh@chromium.org>
 R:     Sami Kyöstilä <skyostil@chromium.org>
@@ -5021,6 +5014,18 @@ M:       Nelson Escobar <neescoba@cisco.com>
 S:     Supported
 F:     drivers/infiniband/hw/usnic/
 
+CLANG CONTROL FLOW INTEGRITY SUPPORT
+M:     Sami Tolvanen <samitolvanen@google.com>
+M:     Kees Cook <keescook@chromium.org>
+R:     Nathan Chancellor <nathan@kernel.org>
+R:     Nick Desaulniers <ndesaulniers@google.com>
+L:     llvm@lists.linux.dev
+S:     Supported
+B:     https://github.com/ClangBuiltLinux/linux/issues
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
+F:     include/linux/cfi.h
+F:     kernel/cfi.c
+
 CLANG-FORMAT FILE
 M:     Miguel Ojeda <ojeda@kernel.org>
 S:     Maintained
@@ -5041,18 +5046,6 @@ F:       scripts/Makefile.clang
 F:     scripts/clang-tools/
 K:     \b(?i:clang|llvm)\b
 
-CLANG CONTROL FLOW INTEGRITY SUPPORT
-M:     Sami Tolvanen <samitolvanen@google.com>
-M:     Kees Cook <keescook@chromium.org>
-R:     Nathan Chancellor <nathan@kernel.org>
-R:     Nick Desaulniers <ndesaulniers@google.com>
-L:     llvm@lists.linux.dev
-S:     Supported
-B:     https://github.com/ClangBuiltLinux/linux/issues
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
-F:     include/linux/cfi.h
-F:     kernel/cfi.c
-
 CLK API
 M:     Russell King <linux@armlinux.org.uk>
 L:     linux-clk@vger.kernel.org
@@ -5223,8 +5216,8 @@ CONTEXT TRACKING
 M:     Frederic Weisbecker <frederic@kernel.org>
 M:     "Paul E. McKenney" <paulmck@kernel.org>
 S:     Maintained
-F:     kernel/context_tracking.c
 F:     include/linux/context_tracking*
+F:     kernel/context_tracking.c
 
 CONTROL GROUP (CGROUP)
 M:     Tejun Heo <tj@kernel.org>
@@ -5385,8 +5378,8 @@ F:        drivers/cpuidle/cpuidle-big_little.c
 
 CPUIDLE DRIVER - ARM EXYNOS
 M:     Daniel Lezcano <daniel.lezcano@linaro.org>
-R:     Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 M:     Kukjin Kim <kgene@kernel.org>
+R:     Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 L:     linux-pm@vger.kernel.org
 L:     linux-samsung-soc@vger.kernel.org
 S:     Supported
@@ -5407,8 +5400,8 @@ M:        Ulf Hansson <ulf.hansson@linaro.org>
 L:     linux-pm@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
-F:     drivers/cpuidle/cpuidle-psci.h
 F:     drivers/cpuidle/cpuidle-psci-domain.c
+F:     drivers/cpuidle/cpuidle-psci.h
 
 CPUIDLE DRIVER - DT IDLE PM DOMAIN
 M:     Ulf Hansson <ulf.hansson@linaro.org>
@@ -5552,19 +5545,19 @@ S:      Supported
 W:     http://www.chelsio.com
 F:     drivers/crypto/chelsio
 
-CXGB4 INLINE CRYPTO DRIVER
-M:     Ayush Sawal <ayush.sawal@chelsio.com>
+CXGB4 ETHERNET DRIVER (CXGB4)
+M:     Raju Rangoju <rajur@chelsio.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 W:     http://www.chelsio.com
-F:     drivers/net/ethernet/chelsio/inline_crypto/
+F:     drivers/net/ethernet/chelsio/cxgb4/
 
-CXGB4 ETHERNET DRIVER (CXGB4)
-M:     Raju Rangoju <rajur@chelsio.com>
+CXGB4 INLINE CRYPTO DRIVER
+M:     Ayush Sawal <ayush.sawal@chelsio.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 W:     http://www.chelsio.com
-F:     drivers/net/ethernet/chelsio/cxgb4/
+F:     drivers/net/ethernet/chelsio/inline_crypto/
 
 CXGB4 ISCSI DRIVER (CXGB4I)
 M:     Varun Prakash <varun@chelsio.com>
@@ -5621,16 +5614,6 @@ CYCLADES PC300 DRIVER
 S:     Orphan
 F:     drivers/net/wan/pc300*
 
-CYPRESS_FIRMWARE MEDIA DRIVER
-M:     Antti Palosaari <crope@iki.fi>
-L:     linux-media@vger.kernel.org
-S:     Maintained
-W:     https://linuxtv.org
-W:     http://palosaari.fi/linux/
-Q:     http://patchwork.linuxtv.org/project/linux-media/list/
-T:     git git://linuxtv.org/anttip/media_tree.git
-F:     drivers/media/common/cypress_firmware*
-
 CYPRESS CY8C95X0 PINCTRL DRIVER
 M:     Patrick Rudolph <patrick.rudolph@9elements.com>
 L:     linux-gpio@vger.kernel.org
@@ -5650,6 +5633,16 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/input/cypress-sf.yaml
 F:     drivers/input/keyboard/cypress-sf.c
 
+CYPRESS_FIRMWARE MEDIA DRIVER
+M:     Antti Palosaari <crope@iki.fi>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+W:     https://linuxtv.org
+W:     http://palosaari.fi/linux/
+Q:     http://patchwork.linuxtv.org/project/linux-media/list/
+T:     git git://linuxtv.org/anttip/media_tree.git
+F:     drivers/media/common/cypress_firmware*
+
 CYTTSP TOUCHSCREEN DRIVER
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-input@vger.kernel.org
@@ -5816,11 +5809,6 @@ S:       Maintained
 F:     Documentation/driver-api/dcdbas.rst
 F:     drivers/platform/x86/dell/dcdbas.*
 
-DELL WMI DESCRIPTOR DRIVER
-L:     Dell.Client.Kernel@dell.com
-S:     Maintained
-F:     drivers/platform/x86/dell/dell-wmi-descriptor.c
-
 DELL WMI DDV DRIVER
 M:     Armin Wolf <W_Armin@gmx.de>
 S:     Maintained
@@ -5828,13 +5816,17 @@ F:      Documentation/ABI/testing/debugfs-dell-wmi-ddv
 F:     Documentation/ABI/testing/sysfs-platform-dell-wmi-ddv
 F:     drivers/platform/x86/dell/dell-wmi-ddv.c
 
-DELL WMI SYSMAN DRIVER
-M:     Prasanth Ksr <prasanth.ksr@dell.com>
+DELL WMI DESCRIPTOR DRIVER
+L:     Dell.Client.Kernel@dell.com
+S:     Maintained
+F:     drivers/platform/x86/dell/dell-wmi-descriptor.c
+
+DELL WMI HARDWARE PRIVACY SUPPORT
+M:     Perry Yuan <Perry.Yuan@dell.com>
 L:     Dell.Client.Kernel@dell.com
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-F:     Documentation/ABI/testing/sysfs-class-firmware-attributes
-F:     drivers/platform/x86/dell/dell-wmi-sysman/
+F:     drivers/platform/x86/dell/dell-wmi-privacy.c
 
 DELL WMI NOTIFICATIONS DRIVER
 M:     Matthew Garrett <mjg59@srcf.ucam.org>
@@ -5842,20 +5834,13 @@ M:      Pali Rohár <pali@kernel.org>
 S:     Maintained
 F:     drivers/platform/x86/dell/dell-wmi-base.c
 
-DELL WMI HARDWARE PRIVACY SUPPORT
-M:     Perry Yuan <Perry.Yuan@dell.com>
+DELL WMI SYSMAN DRIVER
+M:     Prasanth Ksr <prasanth.ksr@dell.com>
 L:     Dell.Client.Kernel@dell.com
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-F:     drivers/platform/x86/dell/dell-wmi-privacy.c
-
-DELTA ST MEDIA DRIVER
-M:     Hugues Fruchet <hugues.fruchet@foss.st.com>
-L:     linux-media@vger.kernel.org
-S:     Supported
-W:     https://linuxtv.org
-T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/platform/st/sti/delta
+F:     Documentation/ABI/testing/sysfs-class-firmware-attributes
+F:     drivers/platform/x86/dell/dell-wmi-sysman/
 
 DELTA AHE-50DC FAN CONTROL MODULE DRIVER
 M:     Zev Weiss <zev@bewilderbeest.net>
@@ -5879,6 +5864,14 @@ F:       Documentation/devicetree/bindings/reset/delta,tn48m-reset.yaml
 F:     drivers/gpio/gpio-tn48m.c
 F:     include/dt-bindings/reset/delta,tn48m-reset.h
 
+DELTA ST MEDIA DRIVER
+M:     Hugues Fruchet <hugues.fruchet@foss.st.com>
+L:     linux-media@vger.kernel.org
+S:     Supported
+W:     https://linuxtv.org
+T:     git git://linuxtv.org/media_tree.git
+F:     drivers/media/platform/st/sti/delta
+
 DENALI NAND DRIVER
 L:     linux-mtd@lists.infradead.org
 S:     Orphan
@@ -5891,13 +5884,6 @@ S:       Maintained
 F:     drivers/dma/dw-edma/
 F:     include/linux/dma/edma.h
 
-DESIGNWARE XDATA IP DRIVER
-M:     Gustavo Pimentel <gustavo.pimentel@synopsys.com>
-L:     linux-pci@vger.kernel.org
-S:     Maintained
-F:     Documentation/misc-devices/dw-xdata-pcie.rst
-F:     drivers/misc/dw-xdata-pcie.c
-
 DESIGNWARE USB2 DRD IP DRIVER
 M:     Minas Harutyunyan <hminas@synopsys.com>
 L:     linux-usb@vger.kernel.org
@@ -5911,6 +5897,13 @@ L:       linux-usb@vger.kernel.org
 S:     Maintained
 F:     drivers/usb/dwc3/
 
+DESIGNWARE XDATA IP DRIVER
+M:     Gustavo Pimentel <gustavo.pimentel@synopsys.com>
+L:     linux-pci@vger.kernel.org
+S:     Maintained
+F:     Documentation/misc-devices/dw-xdata-pcie.rst
+F:     drivers/misc/dw-xdata-pcie.c
+
 DEVANTECH SRF ULTRASONIC RANGER IIO DRIVER
 M:     Andreas Klinger <ak@it-klinger.de>
 L:     linux-iio@vger.kernel.org
@@ -6020,8 +6013,8 @@ F:        Documentation/devicetree/bindings/input/da90??-onkey.txt
 F:     Documentation/devicetree/bindings/input/dlg,da72??.txt
 F:     Documentation/devicetree/bindings/mfd/da90*.txt
 F:     Documentation/devicetree/bindings/mfd/da90*.yaml
-F:     Documentation/devicetree/bindings/regulator/dlg,da9*.yaml
 F:     Documentation/devicetree/bindings/regulator/da92*.txt
+F:     Documentation/devicetree/bindings/regulator/dlg,da9*.yaml
 F:     Documentation/devicetree/bindings/regulator/slg51000.txt
 F:     Documentation/devicetree/bindings/sound/da[79]*.txt
 F:     Documentation/devicetree/bindings/thermal/da90??-thermal.txt
@@ -6140,6 +6133,12 @@ F:       include/linux/dma/
 F:     include/linux/dmaengine.h
 F:     include/linux/of_dma.h
 
+DMA MAPPING BENCHMARK
+M:     Xiang Chen <chenxiang66@hisilicon.com>
+L:     iommu@lists.linux.dev
+F:     kernel/dma/map_benchmark.c
+F:     tools/testing/selftests/dma/
+
 DMA MAPPING HELPERS
 M:     Christoph Hellwig <hch@lst.de>
 M:     Marek Szyprowski <m.szyprowski@samsung.com>
@@ -6150,17 +6149,11 @@ W:      http://git.infradead.org/users/hch/dma-mapping.git
 T:     git git://git.infradead.org/users/hch/dma-mapping.git
 F:     include/asm-generic/dma-mapping.h
 F:     include/linux/dma-direct.h
-F:     include/linux/dma-mapping.h
 F:     include/linux/dma-map-ops.h
+F:     include/linux/dma-mapping.h
 F:     include/linux/swiotlb.h
 F:     kernel/dma/
 
-DMA MAPPING BENCHMARK
-M:     Xiang Chen <chenxiang66@hisilicon.com>
-L:     iommu@lists.linux.dev
-F:     kernel/dma/map_benchmark.c
-F:     tools/testing/selftests/dma/
-
 DMA-BUF HEAPS FRAMEWORK
 M:     Sumit Semwal <sumit.semwal@linaro.org>
 R:     Benjamin Gaignard <benjamin.gaignard@collabora.com>
@@ -6350,6 +6343,25 @@ S:       Maintained
 F:     drivers/soc/ti/smartreflex.c
 F:     include/linux/power/smartreflex.h
 
+DRM ACCEL DRIVERS FOR INTEL VPU
+M:     Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
+M:     Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
+L:     dri-devel@lists.freedesktop.org
+S:     Supported
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     drivers/accel/ivpu/
+F:     include/uapi/drm/ivpu_accel.h
+
+DRM COMPUTE ACCELERATORS DRIVERS AND FRAMEWORK
+M:     Oded Gabbay <ogabbay@kernel.org>
+L:     dri-devel@lists.freedesktop.org
+S:     Maintained
+C:     irc://irc.oftc.net/dri-devel
+T:     git https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/accel.git
+F:     Documentation/accel/
+F:     drivers/accel/
+F:     include/drm/drm_accel.h
+
 DRM DRIVER FOR ALLWINNER DE2 AND DE3 ENGINE
 M:     Maxime Ripard <mripard@kernel.org>
 M:     Chen-Yu Tsai <wens@csie.org>
@@ -6432,6 +6444,21 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.yaml
 F:     drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
 
+DRM DRIVER FOR FIRMWARE FRAMEBUFFERS
+M:     Thomas Zimmermann <tzimmermann@suse.de>
+M:     Javier Martinez Canillas <javierm@redhat.com>
+L:     dri-devel@lists.freedesktop.org
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     drivers/gpu/drm/drm_aperture.c
+F:     drivers/gpu/drm/tiny/ofdrm.c
+F:     drivers/gpu/drm/tiny/simpledrm.c
+F:     drivers/video/aperture.c
+F:     drivers/video/nomodeset.c
+F:     include/drm/drm_aperture.h
+F:     include/linux/aperture.h
+F:     include/video/nomodeset.h
+
 DRM DRIVER FOR GENERIC EDP PANELS
 R:     Douglas Anderson <dianders@chromium.org>
 F:     Documentation/devicetree/bindings/display/panel/panel-edp.yaml
@@ -6466,6 +6493,14 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/himax,hx8357d.txt
 F:     drivers/gpu/drm/tiny/hx8357d.c
 
+DRM DRIVER FOR HYPERV SYNTHETIC VIDEO DEVICE
+M:     Deepak Rawat <drawat.floss@gmail.com>
+L:     linux-hyperv@vger.kernel.org
+L:     dri-devel@lists.freedesktop.org
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     drivers/gpu/drm/hyperv
+
 DRM DRIVER FOR ILITEK ILI9225 PANELS
 M:     David Lechner <david@lechnology.com>
 S:     Maintained
@@ -6495,11 +6530,11 @@ F:      drivers/gpu/drm/logicvc/
 DRM DRIVER FOR LVDS PANELS
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     dri-devel@lists.freedesktop.org
-T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
-F:     drivers/gpu/drm/panel/panel-lvds.c
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/lvds.yaml
 F:     Documentation/devicetree/bindings/display/panel/panel-lvds.yaml
+F:     drivers/gpu/drm/panel/panel-lvds.c
 
 DRM DRIVER FOR MANTIX MLAF057WE51 PANELS
 M:     Guido Günther <agx@sigxcpu.org>
@@ -6608,13 +6643,6 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 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 <javierm@redhat.com>
-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 <airlied@redhat.com>
 M:     Gerd Hoffmann <kraxel@redhat.com>
@@ -6663,29 +6691,6 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/display/panel/samsung,s6d27a1.yaml
 F:     drivers/gpu/drm/panel/panel-samsung-s6d27a1.c
 
-DRM DRIVER FOR SITRONIX ST7703 PANELS
-M:     Guido Günther <agx@sigxcpu.org>
-R:     Purism Kernel Team <kernel@puri.sm>
-R:     Ondrej Jirman <megous@megous.com>
-S:     Maintained
-F:     Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
-F:     drivers/gpu/drm/panel/panel-sitronix-st7703.c
-
-DRM DRIVER FOR FIRMWARE FRAMEBUFFERS
-M:     Thomas Zimmermann <tzimmermann@suse.de>
-M:     Javier Martinez Canillas <javierm@redhat.com>
-L:     dri-devel@lists.freedesktop.org
-S:     Maintained
-T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     drivers/gpu/drm/drm_aperture.c
-F:     drivers/gpu/drm/tiny/ofdrm.c
-F:     drivers/gpu/drm/tiny/simpledrm.c
-F:     drivers/video/aperture.c
-F:     drivers/video/nomodeset.c
-F:     include/drm/drm_aperture.h
-F:     include/linux/aperture.h
-F:     include/video/nomodeset.h
-
 DRM DRIVER FOR SITRONIX ST7586 PANELS
 M:     David Lechner <david@lechnology.com>
 S:     Maintained
@@ -6699,6 +6704,14 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml
 F:     drivers/gpu/drm/panel/panel-sitronix-st7701.c
 
+DRM DRIVER FOR SITRONIX ST7703 PANELS
+M:     Guido Günther <agx@sigxcpu.org>
+R:     Purism Kernel Team <kernel@puri.sm>
+R:     Ondrej Jirman <megous@megous.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
+F:     drivers/gpu/drm/panel/panel-sitronix-st7703.c
+
 DRM DRIVER FOR SITRONIX ST7735R PANELS
 M:     David Lechner <david@lechnology.com>
 S:     Maintained
@@ -6706,6 +6719,13 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/sitronix,st7735r.yaml
 F:     drivers/gpu/drm/tiny/st7735r.c
 
+DRM DRIVER FOR SOLOMON SSD130X OLED DISPLAYS
+M:     Javier Martinez Canillas <javierm@redhat.com>
+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 ST-ERICSSON MCDE
 M:     Linus Walleij <linus.walleij@linaro.org>
 S:     Maintained
@@ -6804,25 +6824,6 @@ F:       include/drm/drm*
 F:     include/linux/vga*
 F:     include/uapi/drm/drm*
 
-DRM COMPUTE ACCELERATORS DRIVERS AND FRAMEWORK
-M:     Oded Gabbay <ogabbay@kernel.org>
-L:     dri-devel@lists.freedesktop.org
-S:     Maintained
-C:     irc://irc.oftc.net/dri-devel
-T:     git https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/accel.git
-F:     Documentation/accel/
-F:     drivers/accel/
-F:     include/drm/drm_accel.h
-
-DRM ACCEL DRIVERS FOR INTEL VPU
-M:     Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
-M:     Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
-L:     dri-devel@lists.freedesktop.org
-S:     Supported
-T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     drivers/accel/ivpu/
-F:     include/uapi/drm/ivpu_accel.h
-
 DRM DRIVERS FOR ALLWINNER A10
 M:     Maxime Ripard <mripard@kernel.org>
 M:     Chen-Yu Tsai <wens@csie.org>
@@ -6926,14 +6927,6 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/hisilicon/
 F:     drivers/gpu/drm/hisilicon/
 
-DRM DRIVER FOR HYPERV SYNTHETIC VIDEO DEVICE
-M:     Deepak Rawat <drawat.floss@gmail.com>
-L:     linux-hyperv@vger.kernel.org
-L:     dri-devel@lists.freedesktop.org
-S:     Maintained
-T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     drivers/gpu/drm/hyperv
-
 DRM DRIVERS FOR LIMA
 M:     Qiang Yu <yuq825@gmail.com>
 L:     dri-devel@lists.freedesktop.org
@@ -7085,6 +7078,14 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/xlnx/
 F:     drivers/gpu/drm/xlnx/
 
+DRM GPU SCHEDULER
+M:     Luben Tuikov <luben.tuikov@amd.com>
+L:     dri-devel@lists.freedesktop.org
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     drivers/gpu/drm/scheduler/
+F:     include/drm/gpu_scheduler.h
+
 DRM PANEL DRIVERS
 M:     Neil Armstrong <neil.armstrong@linaro.org>
 R:     Sam Ravnborg <sam@ravnborg.org>
@@ -7113,14 +7114,6 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     drivers/gpu/drm/ttm/
 F:     include/drm/ttm/
 
-DRM GPU SCHEDULER
-M:     Luben Tuikov <luben.tuikov@amd.com>
-L:     dri-devel@lists.freedesktop.org
-S:     Maintained
-T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     drivers/gpu/drm/scheduler/
-F:     include/drm/gpu_scheduler.h
-
 DSBR100 USB FM RADIO DRIVER
 M:     Alexey Klimov <klimov.linux@gmail.com>
 L:     linux-media@vger.kernel.org
@@ -7248,10 +7241,10 @@ F:      drivers/media/usb/dvb-usb-v2/usb_urb.c
 
 DYNAMIC DEBUG
 M:     Jason Baron <jbaron@akamai.com>
+M:     Jim Cromie <jim.cromie@gmail.com>
 S:     Maintained
 F:     include/linux/dynamic_debug.h
 F:     lib/dynamic_debug.c
-M:     Jim Cromie <jim.cromie@gmail.com>
 F:     lib/test_dynamic_debug.c
 
 DYNAMIC INTERRUPT MODERATION
@@ -7261,6 +7254,15 @@ F:       Documentation/networking/net_dim.rst
 F:     include/linux/dim.h
 F:     lib/dim/
 
+DYNAMIC THERMAL POWER MANAGEMENT (DTPM)
+M:     Daniel Lezcano <daniel.lezcano@kernel.org>
+L:     linux-pm@vger.kernel.org
+S:     Supported
+B:     https://bugzilla.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+F:     drivers/powercap/dtpm*
+F:     include/linux/dtpm.h
+
 DZ DECSTATION DZ11 SERIAL DRIVER
 M:     "Maciej W. Rozycki" <macro@orcam.me.uk>
 S:     Maintained
@@ -7599,22 +7601,22 @@ W:      http://www.broadcom.com
 F:     drivers/infiniband/hw/ocrdma/
 F:     include/uapi/rdma/ocrdma-abi.h
 
-EMULEX/BROADCOM LPFC FC/FCOE SCSI DRIVER
+EMULEX/BROADCOM EFCT FC/FCOE SCSI TARGET DRIVER
 M:     James Smart <james.smart@broadcom.com>
-M:     Dick Kennedy <dick.kennedy@broadcom.com>
+M:     Ram Vegesna <ram.vegesna@broadcom.com>
 L:     linux-scsi@vger.kernel.org
+L:     target-devel@vger.kernel.org
 S:     Supported
 W:     http://www.broadcom.com
-F:     drivers/scsi/lpfc/
+F:     drivers/scsi/elx/
 
-EMULEX/BROADCOM EFCT FC/FCOE SCSI TARGET DRIVER
+EMULEX/BROADCOM LPFC FC/FCOE SCSI DRIVER
 M:     James Smart <james.smart@broadcom.com>
-M:     Ram Vegesna <ram.vegesna@broadcom.com>
+M:     Dick Kennedy <dick.kennedy@broadcom.com>
 L:     linux-scsi@vger.kernel.org
-L:     target-devel@vger.kernel.org
 S:     Supported
 W:     http://www.broadcom.com
-F:     drivers/scsi/elx/
+F:     drivers/scsi/lpfc/
 
 ENE CB710 FLASH CARD READER DRIVER
 M:     MichaÅ‚ MirosÅ‚aw <mirq-linux@rere.qmqm.pl>
@@ -7707,8 +7709,8 @@ F:        drivers/net/mdio/of_mdio.c
 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/linkmode.h
 F:     include/linux/mdio/*.h
 F:     include/linux/mii.h
 F:     include/linux/of_net.h
@@ -7771,8 +7773,8 @@ M:        Mimi Zohar <zohar@linux.ibm.com>
 L:     linux-integrity@vger.kernel.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
-F:     security/integrity/evm/
 F:     security/integrity/
+F:     security/integrity/evm/
 
 EXTENSIBLE FIRMWARE INTERFACE (EFI)
 M:     Ard Biesheuvel <ardb@kernel.org>
@@ -7803,8 +7805,8 @@ EXTRA BOOT CONFIG
 M:     Masami Hiramatsu <mhiramat@kernel.org>
 L:     linux-kernel@vger.kernel.org
 L:     linux-trace-kernel@vger.kernel.org
-Q:     https://patchwork.kernel.org/project/linux-trace-kernel/list/
 S:     Maintained
+Q:     https://patchwork.kernel.org/project/linux-trace-kernel/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
 F:     Documentation/admin-guide/bootconfig.rst
 F:     fs/proc/bootconfig.c
@@ -8091,21 +8093,6 @@ F:       Documentation/fpga/
 F:     drivers/fpga/
 F:     include/linux/fpga/
 
-INTEL MAX10 BMC SECURE UPDATES
-M:     Russ Weight <russell.h.weight@intel.com>
-L:     linux-fpga@vger.kernel.org
-S:     Maintained
-F:     Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
-F:     drivers/fpga/intel-m10-bmc-sec-update.c
-
-MICROCHIP POLARFIRE FPGA DRIVERS
-M:     Conor Dooley <conor.dooley@microchip.com>
-R:     Ivan Bornyakov <i.bornyakov@metrotek.ru>
-L:     linux-fpga@vger.kernel.org
-S:     Supported
-F:     Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml
-F:     drivers/fpga/microchip-spi.c
-
 FPU EMULATOR
 M:     Bill Metzenthen <billm@melbpc.org.au>
 S:     Maintained
@@ -8114,9 +8101,9 @@ F:        arch/x86/math-emu/
 
 FRAMEBUFFER CORE
 M:     Daniel Vetter <daniel@ffwll.ch>
-F:     drivers/video/fbdev/core/
 S:     Odd Fixes
 T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     drivers/video/fbdev/core/
 
 FRAMEBUFFER LAYER
 M:     Helge Deller <deller@gmx.de>
@@ -8493,15 +8480,15 @@ M:      Masami Hiramatsu <mhiramat@kernel.org>
 R:     Mark Rutland <mark.rutland@arm.com>
 L:     linux-kernel@vger.kernel.org
 L:     linux-trace-kernel@vger.kernel.org
-Q:     https://patchwork.kernel.org/project/linux-trace-kernel/list/
 S:     Maintained
+Q:     https://patchwork.kernel.org/project/linux-trace-kernel/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
 F:     Documentation/trace/ftrace*
-F:     kernel/trace/ftrace*
-F:     kernel/trace/fgraph.c
 F:     arch/*/*/*/*ftrace*
 F:     arch/*/*/*ftrace*
 F:     include/*/ftrace.h
+F:     kernel/trace/fgraph.c
+F:     kernel/trace/ftrace*
 F:     samples/ftrace
 
 FUNGIBLE ETHERNET DRIVERS
@@ -8542,10 +8529,10 @@ GATEWORKS SYSTEM CONTROLLER (GSC) DRIVER
 M:     Tim Harvey <tharvey@gateworks.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml
-F:     drivers/mfd/gateworks-gsc.c
-F:     include/linux/mfd/gsc.h
 F:     Documentation/hwmon/gsc-hwmon.rst
 F:     drivers/hwmon/gsc-hwmon.c
+F:     drivers/mfd/gateworks-gsc.c
+F:     include/linux/mfd/gsc.h
 F:     include/linux/platform_data/gsc_hwmon.h
 
 GCC PLUGINS
@@ -8673,8 +8660,8 @@ R:        Andy Shevchenko <andy@kernel.org>
 S:     Maintained
 F:     lib/string.c
 F:     lib/string_helpers.c
-F:     lib/test_string.c
 F:     lib/test-string_helpers.c
+F:     lib/test_string.c
 
 GENERIC UIO DRIVER FOR PCI DEVICES
 M:     "Michael S. Tsirkin" <mst@redhat.com>
@@ -9157,12 +9144,11 @@ L:      linux-input@vger.kernel.org
 S:     Maintained
 F:     drivers/hid/hid-logitech-*
 
-HID++ LOGITECH DRIVERS
-R:     Filipe Laíns <lains@riseup.net>
-R:     Bastien Nocera <hadess@hadess.net>
+HID PHOENIX RC FLIGHT CONTROLLER
+M:     Marcus Folkesson <marcus.folkesson@gmail.com>
 L:     linux-input@vger.kernel.org
 S:     Maintained
-F:     drivers/hid/hid-logitech-hidpp.c
+F:     drivers/hid/hid-pxrc.c
 
 HID PLAYSTATION DRIVER
 M:     Roderick Colenbrander <roderick.colenbrander@sony.com>
@@ -9170,12 +9156,6 @@ L:       linux-input@vger.kernel.org
 S:     Supported
 F:     drivers/hid/hid-playstation.c
 
-HID PHOENIX RC FLIGHT CONTROLLER
-M:     Marcus Folkesson <marcus.folkesson@gmail.com>
-L:     linux-input@vger.kernel.org
-S:     Maintained
-F:     drivers/hid/hid-pxrc.c
-
 HID SENSOR HUB DRIVERS
 M:     Jiri Kosina <jikos@kernel.org>
 M:     Jonathan Cameron <jic23@kernel.org>
@@ -9202,6 +9182,13 @@ S:       Maintained
 F:     drivers/hid/wacom.h
 F:     drivers/hid/wacom_*
 
+HID++ LOGITECH DRIVERS
+R:     Filipe Laíns <lains@riseup.net>
+R:     Bastien Nocera <hadess@hadess.net>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/hid/hid-logitech-hidpp.c
+
 HIGH-RESOLUTION TIMERS, CLOCKEVENTS
 M:     Thomas Gleixner <tglx@linutronix.de>
 L:     linux-kernel@vger.kernel.org
@@ -9226,6 +9213,12 @@ W:       http://www.highpoint-tech.com
 F:     Documentation/scsi/hptiop.rst
 F:     drivers/scsi/hptiop.c
 
+HIKEY960 ONBOARD USB GPIO HUB DRIVER
+M:     John Stultz <jstultz@google.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/misc/hisi_hikey_usb.c
+
 HIMAX HX83112B TOUCHSCREEN SUPPORT
 M:     Job Noorman <job@noorman.info>
 L:     linux-input@vger.kernel.org
@@ -9274,6 +9267,12 @@ F:       drivers/crypto/hisilicon/hpre/hpre.h
 F:     drivers/crypto/hisilicon/hpre/hpre_crypto.c
 F:     drivers/crypto/hisilicon/hpre/hpre_main.c
 
+HISILICON HNS3 PMU DRIVER
+M:     Guangbin Huang <huangguangbin2@huawei.com>
+S:     Supported
+F:     Documentation/admin-guide/perf/hns3-pmu.rst
+F:     drivers/perf/hisilicon/hns3_pmu.c
+
 HISILICON I2C CONTROLLER DRIVER
 M:     Yicong Yang <yangyicong@hisilicon.com>
 L:     linux-i2c@vger.kernel.org
@@ -9306,12 +9305,6 @@ W:       http://www.hisilicon.com
 F:     Documentation/devicetree/bindings/net/hisilicon*.txt
 F:     drivers/net/ethernet/hisilicon/
 
-HIKEY960 ONBOARD USB GPIO HUB DRIVER
-M:     John Stultz <jstultz@google.com>
-L:     linux-kernel@vger.kernel.org
-S:     Maintained
-F:     drivers/misc/hisi_hikey_usb.c
-
 HISILICON PMU DRIVER
 M:     Shaokun Zhang <zhangshaokun@hisilicon.com>
 M:     Jonathan Cameron <jonathan.cameron@huawei.com>
@@ -9321,12 +9314,6 @@ F:       Documentation/admin-guide/perf/hisi-pcie-pmu.rst
 F:     Documentation/admin-guide/perf/hisi-pmu.rst
 F:     drivers/perf/hisilicon
 
-HISILICON HNS3 PMU DRIVER
-M:     Guangbin Huang <huangguangbin2@huawei.com>
-S:     Supported
-F:     Documentation/admin-guide/perf/hns3-pmu.rst
-F:     drivers/perf/hisilicon/hns3_pmu.c
-
 HISILICON PTT DRIVER
 M:     Yicong Yang <yangyicong@hisilicon.com>
 M:     Jonathan Cameron <jonathan.cameron@huawei.com>
@@ -9350,14 +9337,6 @@ F:       drivers/crypto/hisilicon/qm.c
 F:     drivers/crypto/hisilicon/sgl.c
 F:     include/linux/hisi_acc_qm.h
 
-HISILICON ZIP Controller DRIVER
-M:     Yang Shen <shenyang39@huawei.com>
-M:     Zhou Wang <wangzhou1@hisilicon.com>
-L:     linux-crypto@vger.kernel.org
-S:     Maintained
-F:     Documentation/ABI/testing/debugfs-hisi-zip
-F:     drivers/crypto/hisilicon/zip/
-
 HISILICON ROCE DRIVER
 M:     Haoyue Xu <xuhaoyue1@hisilicon.com>
 M:     Wenpeng Liang <liangwenpeng@huawei.com>
@@ -9416,6 +9395,14 @@ S:       Maintained
 W:     http://www.hisilicon.com
 F:     drivers/spi/spi-hisi-sfc-v3xx.c
 
+HISILICON ZIP Controller DRIVER
+M:     Yang Shen <shenyang39@huawei.com>
+M:     Zhou Wang <wangzhou1@hisilicon.com>
+L:     linux-crypto@vger.kernel.org
+S:     Maintained
+F:     Documentation/ABI/testing/debugfs-hisi-zip
+F:     drivers/crypto/hisilicon/zip/
+
 HMM - Heterogeneous Memory Management
 M:     Jérôme Glisse <jglisse@redhat.com>
 L:     linux-mm@kvack.org
@@ -9492,9 +9479,9 @@ F:        drivers/input/touchscreen/htcpen.c
 HTE SUBSYSTEM
 M:     Dipen Patel <dipenp@nvidia.com>
 L:     timestamp@lists.linux.dev
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git
-Q:     https://patchwork.kernel.org/project/timestamp/list/
 S:     Maintained
+Q:     https://patchwork.kernel.org/project/timestamp/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git
 F:     Documentation/devicetree/bindings/timestamp/
 F:     Documentation/driver-api/hte/
 F:     drivers/hte/
@@ -9589,8 +9576,8 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
 F:     Documentation/ABI/stable/sysfs-bus-vmbus
 F:     Documentation/ABI/testing/debugfs-hyperv
 F:     Documentation/devicetree/bindings/bus/microsoft,vmbus.yaml
-F:     Documentation/virt/hyperv
 F:     Documentation/networking/device_drivers/ethernet/microsoft/netvsc.rst
+F:     Documentation/virt/hyperv
 F:     arch/arm64/hyperv
 F:     arch/arm64/include/asm/hyperv-tlfs.h
 F:     arch/arm64/include/asm/mshyperv.h
@@ -9772,6 +9759,12 @@ L:       linux-i2c@vger.kernel.org
 S:     Maintained
 F:     drivers/i2c/i2c-stub.c
 
+I3C DRIVER FOR ASPEED AST2600
+M:     Jeremy Kerr <jk@codeconstruct.com.au>
+S:     Maintained
+F:     Documentation/devicetree/bindings/i3c/aspeed,ast2600-i3c.yaml
+F:     drivers/i3c/master/ast2600-i3c-master.c
+
 I3C DRIVER FOR CADENCE I3C MASTER IP
 M:     PrzemysÅ‚aw Gaj <pgaj@cadence.com>
 S:     Maintained
@@ -9783,12 +9776,6 @@ S:       Orphan
 F:     Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.yaml
 F:     drivers/i3c/master/dw*
 
-I3C DRIVER FOR ASPEED AST2600
-M:     Jeremy Kerr <jk@codeconstruct.com.au>
-S:     Maintained
-F:     Documentation/devicetree/bindings/i3c/aspeed,ast2600-i3c.yaml
-F:     drivers/i3c/master/ast2600-i3c-master.c
-
 I3C SUBSYSTEM
 M:     Alexandre Belloni <alexandre.belloni@bootlin.com>
 L:     linux-i3c@lists.infradead.org (moderated for non-subscribers)
@@ -9867,6 +9854,11 @@ L:       netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/ibm/ibmvnic.*
 
+IBM Power VFIO Support
+M:     Timothy Pearson <tpearson@raptorengineering.com>
+S:     Supported
+F:     drivers/vfio/vfio_iommu_spapr_tce.c
+
 IBM Power Virtual Ethernet Device Driver
 M:     Nick Child <nnac123@linux.ibm.com>
 L:     netdev@vger.kernel.org
@@ -9912,11 +9904,6 @@ F:       drivers/crypto/vmx/ghash*
 F:     drivers/crypto/vmx/ppc-xlate.pl
 F:     drivers/crypto/vmx/vmx.c
 
-IBM Power VFIO Support
-M:     Timothy Pearson <tpearson@raptorengineering.com>
-S:     Supported
-F:     drivers/vfio/vfio_iommu_spapr_tce.c
-
 IBM ServeRAID RAID DRIVER
 S:     Orphan
 F:     drivers/scsi/ips.*
@@ -9984,6 +9971,10 @@ F:       include/net/nl802154.h
 F:     net/ieee802154/
 F:     net/mac802154/
 
+IFCVF VIRTIO DATA PATH ACCELERATOR
+R:     Zhu Lingshan <lingshan.zhu@intel.com>
+F:     drivers/vdpa/ifcvf/
+
 IFE PROTOCOL
 M:     Yotam Gigi <yotam.gi@gmail.com>
 M:     Jamal Hadi Salim <jhs@mojatatu.com>
@@ -10248,8 +10239,8 @@ M:      Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
 L:     linux-integrity@vger.kernel.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
-F:     security/integrity/ima/
 F:     security/integrity/
+F:     security/integrity/ima/
 
 INTEL 810/815 FRAMEBUFFER DRIVER
 M:     Antonino Daplas <adaplas@gmail.com>
@@ -10403,14 +10394,6 @@ S:     Supported
 Q:     https://patchwork.kernel.org/project/linux-dmaengine/list/
 F:     drivers/dma/ioat*
 
-INTEL IDXD DRIVER
-M:     Fenghua Yu <fenghua.yu@intel.com>
-M:     Dave Jiang <dave.jiang@intel.com>
-L:     dmaengine@vger.kernel.org
-S:     Supported
-F:     drivers/dma/idxd/*
-F:     include/uapi/linux/idxd.h
-
 INTEL IDLE DRIVER
 M:     Jacob Pan <jacob.jun.pan@linux.intel.com>
 M:     Len Brown <lenb@kernel.org>
@@ -10420,6 +10403,14 @@ B:     https://bugzilla.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
 F:     drivers/idle/intel_idle.c
 
+INTEL IDXD DRIVER
+M:     Fenghua Yu <fenghua.yu@intel.com>
+M:     Dave Jiang <dave.jiang@intel.com>
+L:     dmaengine@vger.kernel.org
+S:     Supported
+F:     drivers/dma/idxd/*
+F:     include/uapi/linux/idxd.h
+
 INTEL IN FIELD SCAN (IFS) DEVICE
 M:     Jithu Joseph <jithu.joseph@intel.com>
 R:     Ashok Raj <ashok.raj@intel.com>
@@ -10466,18 +10457,18 @@ F:    Documentation/admin-guide/media/ipu3_rcb.svg
 F:     Documentation/userspace-api/media/v4l/pixfmt-meta-intel-ipu3.rst
 F:     drivers/staging/media/ipu3/
 
-INTEL IXP4XX CRYPTO SUPPORT
-M:     Corentin Labbe <clabbe@baylibre.com>
-L:     linux-crypto@vger.kernel.org
-S:     Maintained
-F:     drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
-
 INTEL ISHTP ECLITE DRIVER
 M:     Sumesh K Naduvalath <sumesh.k.naduvalath@intel.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Supported
 F:     drivers/platform/x86/intel/ishtp_eclite.c
 
+INTEL IXP4XX CRYPTO SUPPORT
+M:     Corentin Labbe <clabbe@baylibre.com>
+L:     linux-crypto@vger.kernel.org
+S:     Maintained
+F:     drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
+
 INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 M:     Krzysztof Halasa <khalasa@piap.pl>
 S:     Maintained
@@ -10556,6 +10547,13 @@ F:     drivers/hwmon/intel-m10-bmc-hwmon.c
 F:     drivers/mfd/intel-m10-bmc*
 F:     include/linux/mfd/intel-m10-bmc.h
 
+INTEL MAX10 BMC SECURE UPDATES
+M:     Russ Weight <russell.h.weight@intel.com>
+L:     linux-fpga@vger.kernel.org
+S:     Maintained
+F:     Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
+F:     drivers/fpga/intel-m10-bmc-sec-update.c
+
 INTEL P-Unit IPC DRIVER
 M:     Zha Qipeng <qipeng.zha@intel.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -10603,6 +10601,13 @@ L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     drivers/cpufreq/intel_pstate.c
 
+INTEL PTP DFL ToD DRIVER
+M:     Tianfei Zhang <tianfei.zhang@intel.com>
+L:     linux-fpga@vger.kernel.org
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/ptp/ptp_dfl_tod.c
+
 INTEL QUADRATURE ENCODER PERIPHERAL DRIVER
 M:     Jarkko Nikula <jarkko.nikula@linux.intel.com>
 L:     linux-iio@vger.kernel.org
@@ -10621,6 +10626,21 @@ F:     drivers/platform/x86/intel/sdsi.c
 F:     tools/arch/x86/intel_sdsi/
 F:     tools/testing/selftests/drivers/sdsi/
 
+INTEL SGX
+M:     Jarkko Sakkinen <jarkko@kernel.org>
+R:     Dave Hansen <dave.hansen@linux.intel.com>
+L:     linux-sgx@vger.kernel.org
+S:     Supported
+Q:     https://patchwork.kernel.org/project/intel-sgx/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/sgx
+F:     Documentation/arch/x86/sgx.rst
+F:     arch/x86/entry/vdso/vsgx.S
+F:     arch/x86/include/asm/sgx.h
+F:     arch/x86/include/uapi/asm/sgx.h
+F:     arch/x86/kernel/cpu/sgx/*
+F:     tools/testing/selftests/sgx/*
+K:     \bSGX_
+
 INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER
 M:     Daniel Scally <djrscally@gmail.com>
 S:     Maintained
@@ -10638,13 +10658,13 @@ INTEL STRATIX10 FIRMWARE DRIVERS
 M:     Dinh Nguyen <dinguyen@kernel.org>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
 F:     Documentation/ABI/testing/sysfs-devices-platform-stratix10-rsu
 F:     Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt
 F:     drivers/firmware/stratix10-rsu.c
 F:     drivers/firmware/stratix10-svc.c
 F:     include/linux/firmware/intel/stratix10-smc.h
 F:     include/linux/firmware/intel/stratix10-svc-client.h
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
 
 INTEL TELEMETRY DRIVER
 M:     Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>
@@ -10729,21 +10749,6 @@ F:     Documentation/arch/x86/intel_txt.rst
 F:     arch/x86/kernel/tboot.c
 F:     include/linux/tboot.h
 
-INTEL SGX
-M:     Jarkko Sakkinen <jarkko@kernel.org>
-R:     Dave Hansen <dave.hansen@linux.intel.com>
-L:     linux-sgx@vger.kernel.org
-S:     Supported
-Q:     https://patchwork.kernel.org/project/intel-sgx/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/sgx
-F:     Documentation/arch/x86/sgx.rst
-F:     arch/x86/entry/vdso/vsgx.S
-F:     arch/x86/include/asm/sgx.h
-F:     arch/x86/include/uapi/asm/sgx.h
-F:     arch/x86/kernel/cpu/sgx/*
-F:     tools/testing/selftests/sgx/*
-K:     \bSGX_
-
 INTERCONNECT API
 M:     Georgi Djakov <djakov@kernel.org>
 L:     linux-pm@vger.kernel.org
@@ -10812,18 +10817,6 @@ F:     drivers/iommu/dma-iommu.h
 F:     drivers/iommu/iova.c
 F:     include/linux/iova.h
 
-IOMMUFD
-M:     Jason Gunthorpe <jgg@nvidia.com>
-M:     Kevin Tian <kevin.tian@intel.com>
-L:     iommu@lists.linux.dev
-S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git
-F:     Documentation/userspace-api/iommufd.rst
-F:     drivers/iommu/iommufd/
-F:     include/linux/iommufd.h
-F:     include/uapi/linux/iommufd.h
-F:     tools/testing/selftests/iommu/
-
 IOMMU SUBSYSTEM
 M:     Joerg Roedel <joro@8bytes.org>
 M:     Will Deacon <will@kernel.org>
@@ -10839,6 +10832,18 @@ F:     include/linux/iova.h
 F:     include/linux/of_iommu.h
 F:     include/uapi/linux/iommu.h
 
+IOMMUFD
+M:     Jason Gunthorpe <jgg@nvidia.com>
+M:     Kevin Tian <kevin.tian@intel.com>
+L:     iommu@lists.linux.dev
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git
+F:     Documentation/userspace-api/iommufd.rst
+F:     drivers/iommu/iommufd/
+F:     include/linux/iommufd.h
+F:     include/uapi/linux/iommufd.h
+F:     tools/testing/selftests/iommu/
+
 IOSYS-MAP HELPERS
 M:     Thomas Zimmermann <tzimmermann@suse.de>
 L:     dri-devel@lists.freedesktop.org
@@ -10853,11 +10858,11 @@ L:    io-uring@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.dk/linux-block
 T:     git git://git.kernel.dk/liburing
-F:     io_uring/
 F:     include/linux/io_uring.h
 F:     include/linux/io_uring_types.h
 F:     include/trace/events/io_uring.h
 F:     include/uapi/linux/io_uring.h
+F:     io_uring/
 F:     tools/io_uring/
 
 IPMI SUBSYSTEM
@@ -10866,8 +10871,8 @@ L:      openipmi-developer@lists.sourceforge.net (moderated for non-subscribers)
 S:     Supported
 W:     http://openipmi.sourceforge.net/
 T:     git https://github.com/cminyard/linux-ipmi.git for-next
-F:     Documentation/driver-api/ipmi.rst
 F:     Documentation/devicetree/bindings/ipmi/
+F:     Documentation/driver-api/ipmi.rst
 F:     drivers/char/ipmi/
 F:     include/linux/ipmi*
 F:     include/uapi/linux/ipmi*
@@ -10919,8 +10924,8 @@ M:      Thomas Gleixner <tglx@linutronix.de>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
-F:     kernel/irq/
 F:     include/linux/group_cpus.h
+F:     kernel/irq/
 F:     lib/group_cpus.c
 
 IRQCHIP DRIVERS
@@ -11258,6 +11263,7 @@ L:      linux-nfs@vger.kernel.org
 S:     Supported
 W:     http://nfs.sourceforge.net/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git
+F:     Documentation/filesystems/nfs/
 F:     fs/exportfs/
 F:     fs/lockd/
 F:     fs/nfs_common/
@@ -11273,7 +11279,6 @@ F:      include/trace/misc/sunrpc.h
 F:     include/uapi/linux/nfsd/
 F:     include/uapi/linux/sunrpc/
 F:     net/sunrpc/
-F:     Documentation/filesystems/nfs/
 
 KERNEL REGRESSIONS
 M:     Thorsten Leemhuis <linux@leemhuis.info>
@@ -11388,83 +11393,42 @@ F:    arch/riscv/include/asm/kvm*
 F:     arch/riscv/include/uapi/asm/kvm*
 F:     arch/riscv/kvm/
 F:     tools/testing/selftests/kvm/*/riscv/
-
-KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
-M:     Christian Borntraeger <borntraeger@linux.ibm.com>
-M:     Janosch Frank <frankja@linux.ibm.com>
-M:     Claudio Imbrenda <imbrenda@linux.ibm.com>
-R:     David Hildenbrand <david@redhat.com>
-L:     kvm@vger.kernel.org
-S:     Supported
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
-F:     Documentation/virt/kvm/s390*
-F:     arch/s390/include/asm/gmap.h
-F:     arch/s390/include/asm/kvm*
-F:     arch/s390/include/uapi/asm/kvm*
-F:     arch/s390/include/uapi/asm/uvdevice.h
-F:     arch/s390/kernel/uv.c
-F:     arch/s390/kvm/
-F:     arch/s390/mm/gmap.c
-F:     drivers/s390/char/uvdevice.c
-F:     tools/testing/selftests/drivers/s390x/uvdevice/
-F:     tools/testing/selftests/kvm/*/s390x/
-F:     tools/testing/selftests/kvm/s390x/
-
-KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
-M:     Sean Christopherson <seanjc@google.com>
-M:     Paolo Bonzini <pbonzini@redhat.com>
-L:     kvm@vger.kernel.org
-S:     Supported
-T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
-F:     arch/x86/include/asm/kvm*
-F:     arch/x86/include/asm/svm.h
-F:     arch/x86/include/asm/vmx*.h
-F:     arch/x86/include/uapi/asm/kvm*
-F:     arch/x86/include/uapi/asm/svm.h
-F:     arch/x86/include/uapi/asm/vmx.h
-F:     arch/x86/kvm/
-F:     arch/x86/kvm/*/
-
-KVM PARAVIRT (KVM/paravirt)
-M:     Paolo Bonzini <pbonzini@redhat.com>
-R:     Wanpeng Li <wanpengli@tencent.com>
-R:     Vitaly Kuznetsov <vkuznets@redhat.com>
-L:     kvm@vger.kernel.org
-S:     Supported
-T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
-F:     arch/x86/kernel/kvm.c
-F:     arch/x86/kernel/kvmclock.c
-F:     arch/x86/include/asm/pvclock-abi.h
-F:     include/linux/kvm_para.h
-F:     include/uapi/linux/kvm_para.h
-F:     include/uapi/asm-generic/kvm_para.h
-F:     include/asm-generic/kvm_para.h
-F:     arch/um/include/asm/kvm_para.h
-F:     arch/x86/include/asm/kvm_para.h
-F:     arch/x86/include/uapi/asm/kvm_para.h
-
-KVM X86 HYPER-V (KVM/hyper-v)
-M:     Vitaly Kuznetsov <vkuznets@redhat.com>
-M:     Sean Christopherson <seanjc@google.com>
-M:     Paolo Bonzini <pbonzini@redhat.com>
+
+KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
+M:     Christian Borntraeger <borntraeger@linux.ibm.com>
+M:     Janosch Frank <frankja@linux.ibm.com>
+M:     Claudio Imbrenda <imbrenda@linux.ibm.com>
+R:     David Hildenbrand <david@redhat.com>
 L:     kvm@vger.kernel.org
 S:     Supported
-T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
-F:     arch/x86/kvm/hyperv.*
-F:     arch/x86/kvm/kvm_onhyperv.*
-F:     arch/x86/kvm/svm/hyperv.*
-F:     arch/x86/kvm/svm/svm_onhyperv.*
-F:     arch/x86/kvm/vmx/hyperv.*
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
+F:     Documentation/virt/kvm/s390*
+F:     arch/s390/include/asm/gmap.h
+F:     arch/s390/include/asm/kvm*
+F:     arch/s390/include/uapi/asm/kvm*
+F:     arch/s390/include/uapi/asm/uvdevice.h
+F:     arch/s390/kernel/uv.c
+F:     arch/s390/kvm/
+F:     arch/s390/mm/gmap.c
+F:     drivers/s390/char/uvdevice.c
+F:     tools/testing/selftests/drivers/s390x/uvdevice/
+F:     tools/testing/selftests/kvm/*/s390x/
+F:     tools/testing/selftests/kvm/s390x/
 
-KVM X86 Xen (KVM/Xen)
-M:     David Woodhouse <dwmw2@infradead.org>
-M:     Paul Durrant <paul@xen.org>
+KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
 M:     Sean Christopherson <seanjc@google.com>
 M:     Paolo Bonzini <pbonzini@redhat.com>
 L:     kvm@vger.kernel.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
-F:     arch/x86/kvm/xen.*
+F:     arch/x86/include/asm/kvm*
+F:     arch/x86/include/asm/svm.h
+F:     arch/x86/include/asm/vmx*.h
+F:     arch/x86/include/uapi/asm/kvm*
+F:     arch/x86/include/uapi/asm/svm.h
+F:     arch/x86/include/uapi/asm/vmx.h
+F:     arch/x86/kvm/
+F:     arch/x86/kvm/*/
 
 KERNFS
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@ -11504,14 +11468,6 @@ F:     include/keys/trusted-type.h
 F:     include/keys/trusted_tpm.h
 F:     security/keys/trusted-keys/
 
-KEYS-TRUSTED-TEE
-M:     Sumit Garg <sumit.garg@linaro.org>
-L:     linux-integrity@vger.kernel.org
-L:     keyrings@vger.kernel.org
-S:     Supported
-F:     include/keys/trusted_tee.h
-F:     security/keys/trusted-keys/trusted_tee.c
-
 KEYS-TRUSTED-CAAM
 M:     Ahmad Fatoum <a.fatoum@pengutronix.de>
 R:     Pengutronix Kernel Team <kernel@pengutronix.de>
@@ -11521,6 +11477,14 @@ S:     Maintained
 F:     include/keys/trusted_caam.h
 F:     security/keys/trusted-keys/trusted_caam.c
 
+KEYS-TRUSTED-TEE
+M:     Sumit Garg <sumit.garg@linaro.org>
+L:     linux-integrity@vger.kernel.org
+L:     keyrings@vger.kernel.org
+S:     Supported
+F:     include/keys/trusted_tee.h
+F:     security/keys/trusted-keys/trusted_tee.c
+
 KEYS/KEYRINGS
 M:     David Howells <dhowells@redhat.com>
 M:     Jarkko Sakkinen <jarkko@kernel.org>
@@ -11583,8 +11547,8 @@ L:      linux-amlogic@lists.infradead.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/mfd/khadas,mcu.yaml
 F:     drivers/mfd/khadas-mcu.c
-F:     include/linux/mfd/khadas-mcu.h
 F:     drivers/thermal/khadas_mcu_fan.c
+F:     include/linux/mfd/khadas-mcu.h
 
 KIONIX/ROHM KX022A ACCELEROMETER
 M:     Matti Vaittinen <mazziesaccount@gmail.com>
@@ -11621,8 +11585,8 @@ M:      "David S. Miller" <davem@davemloft.net>
 M:     Masami Hiramatsu <mhiramat@kernel.org>
 L:     linux-kernel@vger.kernel.org
 L:     linux-trace-kernel@vger.kernel.org
-Q:     https://patchwork.kernel.org/project/linux-trace-kernel/list/
 S:     Maintained
+Q:     https://patchwork.kernel.org/project/linux-trace-kernel/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
 F:     Documentation/trace/kprobes.rst
 F:     include/asm-generic/kprobes.h
@@ -11656,6 +11620,47 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/leds/backlight/kinetic,ktz8866.yaml
 F:     drivers/video/backlight/ktz8866.c
 
+KVM PARAVIRT (KVM/paravirt)
+M:     Paolo Bonzini <pbonzini@redhat.com>
+R:     Wanpeng Li <wanpengli@tencent.com>
+R:     Vitaly Kuznetsov <vkuznets@redhat.com>
+L:     kvm@vger.kernel.org
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
+F:     arch/um/include/asm/kvm_para.h
+F:     arch/x86/include/asm/kvm_para.h
+F:     arch/x86/include/asm/pvclock-abi.h
+F:     arch/x86/include/uapi/asm/kvm_para.h
+F:     arch/x86/kernel/kvm.c
+F:     arch/x86/kernel/kvmclock.c
+F:     include/asm-generic/kvm_para.h
+F:     include/linux/kvm_para.h
+F:     include/uapi/asm-generic/kvm_para.h
+F:     include/uapi/linux/kvm_para.h
+
+KVM X86 HYPER-V (KVM/hyper-v)
+M:     Vitaly Kuznetsov <vkuznets@redhat.com>
+M:     Sean Christopherson <seanjc@google.com>
+M:     Paolo Bonzini <pbonzini@redhat.com>
+L:     kvm@vger.kernel.org
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
+F:     arch/x86/kvm/hyperv.*
+F:     arch/x86/kvm/kvm_onhyperv.*
+F:     arch/x86/kvm/svm/hyperv.*
+F:     arch/x86/kvm/svm/svm_onhyperv.*
+F:     arch/x86/kvm/vmx/hyperv.*
+
+KVM X86 Xen (KVM/Xen)
+M:     David Woodhouse <dwmw2@infradead.org>
+M:     Paul Durrant <paul@xen.org>
+M:     Sean Christopherson <seanjc@google.com>
+M:     Paolo Bonzini <pbonzini@redhat.com>
+L:     kvm@vger.kernel.org
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
+F:     arch/x86/kvm/xen.*
+
 L3MDEV
 M:     David Ahern <dsahern@kernel.org>
 L:     netdev@vger.kernel.org
@@ -11897,9 +11902,9 @@ F:      scripts/spdxexclude
 LINEAR RANGES HELPERS
 M:     Mark Brown <broonie@kernel.org>
 R:     Matti Vaittinen <mazziesaccount@gmail.com>
+F:     include/linux/linear_range.h
 F:     lib/linear_ranges.c
 F:     lib/test_linear_ranges.c
-F:     include/linux/linear_range.h
 
 LINUX FOR POWER MACINTOSH
 M:     Benjamin Herrenschmidt <benh@kernel.crashing.org>
@@ -12026,11 +12031,11 @@ M:    Joel Stanley <joel@jms.id.au>
 S:     Maintained
 F:     Documentation/devicetree/bindings/*/litex,*.yaml
 F:     arch/openrisc/boot/dts/or1klitex.dts
-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
+F:     drivers/net/ethernet/litex/*
+F:     drivers/soc/litex/*
+F:     drivers/tty/serial/liteuart.c
+F:     include/linux/litex.h
 N:     litex
 
 LIVE PATCHING
@@ -12159,10 +12164,17 @@ R:    WANG Xuerui <kernel@xen0n.name>
 L:     loongarch@lists.linux.dev
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git
-F:     arch/loongarch/
-F:     drivers/*/*loongarch*
 F:     Documentation/loongarch/
 F:     Documentation/translations/zh_CN/loongarch/
+F:     arch/loongarch/
+F:     drivers/*/*loongarch*
+
+LOONGSON GPIO DRIVER
+M:     Yinbo Zhu <zhuyinbo@loongson.cn>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
+F:     drivers/gpio/gpio-loongson-64bit.c
 
 LOONGSON LS2X I2C DRIVER
 M:     Binbin Zhou <zhoubinbin@loongson.cn>
@@ -12171,6 +12183,14 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/i2c/loongson,ls2x-i2c.yaml
 F:     drivers/i2c/busses/i2c-ls2x.c
 
+LOONGSON-2 SOC SERIES CLOCK DRIVER
+M:     Yinbo Zhu <zhuyinbo@loongson.cn>
+L:     linux-clk@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/clock/loongson,ls2k-clk.yaml
+F:     drivers/clk/clk-loongson2.c
+F:     include/dt-bindings/clock/loongson,ls2k-clk.h
+
 LOONGSON-2 SOC SERIES GUTS DRIVER
 M:     Yinbo Zhu <zhuyinbo@loongson.cn>
 L:     loongarch@lists.linux.dev
@@ -12186,21 +12206,6 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml
 F:     drivers/pinctrl/pinctrl-loongson2.c
 
-LOONGSON GPIO DRIVER
-M:     Yinbo Zhu <zhuyinbo@loongson.cn>
-L:     linux-gpio@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
-F:     drivers/gpio/gpio-loongson-64bit.c
-
-LOONGSON-2 SOC SERIES CLOCK DRIVER
-M:     Yinbo Zhu <zhuyinbo@loongson.cn>
-L:     linux-clk@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/clock/loongson,ls2k-clk.yaml
-F:     drivers/clk/clk-loongson2.c
-F:     include/dt-bindings/clock/loongson,ls2k-clk.h
-
 LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
 M:     Sathya Prakash <sathya.prakash@broadcom.com>
 M:     Sreekanth Reddy <sreekanth.reddy@broadcom.com>
@@ -12361,20 +12366,26 @@ MAILBOX API
 M:     Jassi Brar <jassisinghbrar@gmail.com>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/mailbox/
 F:     drivers/mailbox/
+F:     include/dt-bindings/mailbox/
 F:     include/linux/mailbox_client.h
 F:     include/linux/mailbox_controller.h
-F:     include/dt-bindings/mailbox/
-F:     Documentation/devicetree/bindings/mailbox/
 
 MAILBOX ARM MHUv2
 M:     Viresh Kumar <viresh.kumar@linaro.org>
 M:     Tushar Khandelwal <Tushar.Khandelwal@arm.com>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/mailbox/arm,mhuv2.yaml
 F:     drivers/mailbox/arm_mhuv2.c
 F:     include/linux/mailbox/arm_mhuv2_message.h
-F:     Documentation/devicetree/bindings/mailbox/arm,mhuv2.yaml
+
+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
+S:     Maintained
+W:     http://www.kernel.org/doc/man-pages
 
 MANAGEMENT COMPONENT TRANSPORT PROTOCOL (MCTP)
 M:     Jeremy Kerr <jk@codeconstruct.com.au>
@@ -12388,12 +12399,6 @@ 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
-S:     Maintained
-W:     http://www.kernel.org/doc/man-pages
-
 MAPLE TREE
 M:     Liam R. Howlett <Liam.Howlett@oracle.com>
 L:     linux-mm@kvack.org
@@ -12425,8 +12430,8 @@ F:      include/linux/platform_data/mv88e6xxx.h
 MARVELL ARMADA 3700 PHY DRIVERS
 M:     Miquel Raynal <miquel.raynal@bootlin.com>
 S:     Maintained
-F:     Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
 F:     Documentation/devicetree/bindings/phy/marvell,armada-3700-utmi-phy.yaml
+F:     Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
 F:     drivers/phy/marvell/phy-mvebu-a3700-comphy.c
 F:     drivers/phy/marvell/phy-mvebu-a3700-utmi.c
 
@@ -12528,6 +12533,13 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/mtd/marvell-nand.txt
 F:     drivers/mtd/nand/raw/marvell_nand.c
 
+MARVELL OCTEON ENDPOINT DRIVER
+M:     Veerasenareddy Burru <vburru@marvell.com>
+M:     Abhijit Ayarekar <aayarekar@marvell.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/marvell/octeon_ep
+
 MARVELL OCTEONTX2 PHYSICAL FUNCTION DRIVER
 M:     Sunil Goutham <sgoutham@marvell.com>
 M:     Geetha sowjanya <gakula@marvell.com>
@@ -12575,13 +12587,6 @@ S:     Supported
 F:     Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
 F:     drivers/mmc/host/sdhci-xenon*
 
-MARVELL OCTEON ENDPOINT DRIVER
-M:     Veerasenareddy Burru <vburru@marvell.com>
-M:     Abhijit Ayarekar <aayarekar@marvell.com>
-L:     netdev@vger.kernel.org
-S:     Supported
-F:     drivers/net/ethernet/marvell/octeon_ep
-
 MATROX FRAMEBUFFER DRIVER
 L:     linux-fbdev@vger.kernel.org
 S:     Orphan
@@ -12781,12 +12786,6 @@ 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
@@ -12796,6 +12795,12 @@ F:     drivers/net/can/m_can/m_can.c
 F:     drivers/net/can/m_can/m_can.h
 F:     drivers/net/can/m_can/m_can_platform.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
+
 MCP2221A MICROCHIP USB-HID TO I2C BRIDGE DRIVER
 M:     Rishi Gupta <gupt21@gmail.com>
 L:     linux-i2c@vger.kernel.org
@@ -13204,13 +13209,6 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/clock/mediatek,mt7621-sysc.yaml
 F:     drivers/clk/ralink/clk-mt7621.c
 
-MEDIATEK MT7621/28/88 I2C DRIVER
-M:     Stefan Roese <sr@denx.de>
-L:     linux-i2c@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/i2c/mediatek,mt7621-i2c.yaml
-F:     drivers/i2c/busses/i2c-mt7621.c
-
 MEDIATEK MT7621 PCIE CONTROLLER DRIVER
 M:     Sergio Paracuellos <sergio.paracuellos@gmail.com>
 S:     Maintained
@@ -13223,6 +13221,13 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/phy/mediatek,mt7621-pci-phy.yaml
 F:     drivers/phy/ralink/phy-mt7621-pci.c
 
+MEDIATEK MT7621/28/88 I2C DRIVER
+M:     Stefan Roese <sr@denx.de>
+L:     linux-i2c@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/i2c/mediatek,mt7621-i2c.yaml
+F:     drivers/i2c/busses/i2c-mt7621.c
+
 MEDIATEK NAND CONTROLLER DRIVER
 L:     linux-mtd@lists.infradead.org
 S:     Orphan
@@ -13482,10 +13487,22 @@ MEMORY FREQUENCY SCALING DRIVERS FOR NVIDIA TEGRA
 M:     Dmitry Osipenko <digetx@gmail.com>
 L:     linux-pm@vger.kernel.org
 L:     linux-tegra@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
 F:     drivers/devfreq/tegra30-devfreq.c
 
+MEMORY HOT(UN)PLUG
+M:     David Hildenbrand <david@redhat.com>
+M:     Oscar Salvador <osalvador@suse.de>
+L:     linux-mm@kvack.org
+S:     Maintained
+F:     Documentation/admin-guide/mm/memory-hotplug.rst
+F:     Documentation/core-api/memory-hotplug.rst
+F:     drivers/base/memory.c
+F:     include/linux/memory_hotplug.h
+F:     mm/memory_hotplug.c
+F:     tools/testing/selftests/memory-hotplug/
+
 MEMORY MANAGEMENT
 M:     Andrew Morton <akpm@linux-foundation.org>
 L:     linux-mm@kvack.org
@@ -13504,30 +13521,6 @@ F:     mm/
 F:     tools/mm/
 F:     tools/testing/selftests/mm/
 
-VMALLOC
-M:     Andrew Morton <akpm@linux-foundation.org>
-R:     Uladzislau Rezki <urezki@gmail.com>
-R:     Christoph Hellwig <hch@infradead.org>
-R:     Lorenzo Stoakes <lstoakes@gmail.com>
-L:     linux-mm@kvack.org
-S:     Maintained
-W:     http://www.linux-mm.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
-F:     include/linux/vmalloc.h
-F:     mm/vmalloc.c
-
-MEMORY HOT(UN)PLUG
-M:     David Hildenbrand <david@redhat.com>
-M:     Oscar Salvador <osalvador@suse.de>
-L:     linux-mm@kvack.org
-S:     Maintained
-F:     Documentation/admin-guide/mm/memory-hotplug.rst
-F:     Documentation/core-api/memory-hotplug.rst
-F:     drivers/base/memory.c
-F:     include/linux/memory_hotplug.h
-F:     mm/memory_hotplug.c
-F:     tools/testing/selftests/memory-hotplug/
-
 MEMORY TECHNOLOGY DEVICES (MTD)
 M:     Miquel Raynal <miquel.raynal@bootlin.com>
 M:     Richard Weinberger <richard@nod.at>
@@ -13638,6 +13631,12 @@ W:     http://www.monstr.eu/fdt/
 T:     git git://git.monstr.eu/linux-2.6-microblaze.git
 F:     arch/microblaze/
 
+MICROBLAZE TMR INJECT
+M:     Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/misc/xlnx,tmr-inject.yaml
+F:     drivers/misc/xilinx_tmr_inject.c
+
 MICROBLAZE TMR MANAGER
 M:     Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
 S:     Supported
@@ -13645,12 +13644,6 @@ F:     Documentation/ABI/testing/sysfs-driver-xilinx-tmr-manager
 F:     Documentation/devicetree/bindings/misc/xlnx,tmr-manager.yaml
 F:     drivers/misc/xilinx_tmr_manager.c
 
-MICROBLAZE TMR INJECT
-M:     Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>
-S:     Supported
-F:     Documentation/devicetree/bindings/misc/xlnx,tmr-inject.yaml
-F:     drivers/misc/xilinx_tmr_inject.c
-
 MICROCHIP AT91 DMA DRIVERS
 M:     Ludovic Desroches <ludovic.desroches@microchip.com>
 M:     Tudor Ambarus <tudor.ambarus@linaro.org>
@@ -13725,11 +13718,11 @@ M:    Eugen Hristev <eugen.hristev@microchip.com>
 L:     linux-media@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/media/atmel,isc.yaml
-F:     Documentation/devicetree/bindings/media/microchip,xisc.yaml
-F:     drivers/staging/media/deprecated/atmel/atmel-isc*
-F:     drivers/staging/media/deprecated/atmel/atmel-sama*-isc*
+F:     Documentation/devicetree/bindings/media/microchip,xisc.yaml
 F:     drivers/media/platform/microchip/microchip-isc*
 F:     drivers/media/platform/microchip/microchip-sama*-isc*
+F:     drivers/staging/media/deprecated/atmel/atmel-isc*
+F:     drivers/staging/media/deprecated/atmel/atmel-sama*-isc*
 F:     include/linux/atmel-isc-media.h
 
 MICROCHIP ISI DRIVER
@@ -13751,13 +13744,6 @@ F:     include/linux/dsa/ksz_common.h
 F:     include/linux/platform_data/microchip-ksz.h
 F:     net/dsa/tag_ksz.c
 
-MICROCHIP LAN87xx/LAN937x T1 PHY DRIVER
-M:     Arun Ramadoss <arun.ramadoss@microchip.com>
-R:     UNGLinuxDriver@microchip.com
-L:     netdev@vger.kernel.org
-S:     Maintained
-F:     drivers/net/phy/microchip_t1.c
-
 MICROCHIP LAN743X ETHERNET DRIVER
 M:     Bryan Whitehead <bryan.whitehead@microchip.com>
 M:     UNGLinuxDriver@microchip.com
@@ -13765,6 +13751,13 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/microchip/lan743x_*
 
+MICROCHIP LAN87xx/LAN937x T1 PHY DRIVER
+M:     Arun Ramadoss <arun.ramadoss@microchip.com>
+R:     UNGLinuxDriver@microchip.com
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/phy/microchip_t1.c
+
 MICROCHIP LAN966X ETHERNET DRIVER
 M:     Horatiu Vultur <horatiu.vultur@microchip.com>
 M:     UNGLinuxDriver@microchip.com
@@ -13806,14 +13799,6 @@ S:     Supported
 F:     Documentation/devicetree/bindings/mtd/atmel-nand.txt
 F:     drivers/mtd/nand/raw/atmel/*
 
-MICROCHIP PCI1XXXX GP DRIVER
-M:     Kumaravel Thiagarajan <kumaravel.thiagarajan@microchip.com>
-L:     linux-gpio@vger.kernel.org
-S:     Supported
-F:     drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c
-F:     drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.h
-F:     drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
-
 MICROCHIP OTPC DRIVER
 M:     Claudiu Beznea <claudiu.beznea@microchip.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -13822,6 +13807,14 @@ F:     Documentation/devicetree/bindings/nvmem/microchip,sama7g5-otpc.yaml
 F:     drivers/nvmem/microchip-otpc.c
 F:     include/dt-bindings/nvmem/microchip,sama7g5-otpc.h
 
+MICROCHIP PCI1XXXX GP DRIVER
+M:     Kumaravel Thiagarajan <kumaravel.thiagarajan@microchip.com>
+L:     linux-gpio@vger.kernel.org
+S:     Supported
+F:     drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c
+F:     drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.h
+F:     drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
+
 MICROCHIP PCI1XXXX I2C DRIVER
 M:     Tharun Kumar P <tharunkumar.pasumarthi@microchip.com>
 M:     Kumaravel Thiagarajan <kumaravel.thiagarajan@microchip.com>
@@ -13837,6 +13830,14 @@ L:     linux-serial@vger.kernel.org
 S:     Maintained
 F:     drivers/tty/serial/8250/8250_pci1xxxx.c
 
+MICROCHIP POLARFIRE FPGA DRIVERS
+M:     Conor Dooley <conor.dooley@microchip.com>
+R:     Ivan Bornyakov <i.bornyakov@metrotek.ru>
+L:     linux-fpga@vger.kernel.org
+S:     Supported
+F:     Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml
+F:     drivers/fpga/microchip-spi.c
+
 MICROCHIP PWM DRIVER
 M:     Claudiu Beznea <claudiu.beznea@microchip.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -13858,6 +13859,12 @@ M:     Claudiu Beznea <claudiu.beznea@microchip.com>
 S:     Supported
 F:     drivers/power/reset/at91-sama5d2_shdwc.c
 
+MICROCHIP SOC DRIVERS
+M:     Conor Dooley <conor@kernel.org>
+S:     Supported
+T:     git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
+F:     drivers/soc/microchip/
+
 MICROCHIP SPI DRIVER
 M:     Tudor Ambarus <tudor.ambarus@linaro.org>
 S:     Supported
@@ -13871,11 +13878,12 @@ F:    Documentation/devicetree/bindings/misc/atmel-ssc.txt
 F:     drivers/misc/atmel-ssc.c
 F:     include/linux/atmel-ssc.h
 
-MICROCHIP SOC DRIVERS
-M:     Conor Dooley <conor@kernel.org>
-S:     Supported
-T:     git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
-F:     drivers/soc/microchip/
+Microchip Timer Counter Block (TCB) Capture Driver
+M:     Kamel Bouhara <kamel.bouhara@bootlin.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     drivers/counter/microchip-tcb-capture.c
 
 MICROCHIP USB251XB DRIVER
 M:     Richard Leitner <richard.leitner@skidata.com>
@@ -13992,6 +14000,12 @@ L:     platform-driver-x86@vger.kernel.org
 S:     Supported
 F:     drivers/platform/surface/surfacepro3_button.c
 
+MICROSOFT SURFACE SYSTEM AGGREGATOR HUB DRIVER
+M:     Maximilian Luz <luzmaximilian@gmail.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/platform/surface/surface_aggregator_hub.c
+
 MICROSOFT SURFACE SYSTEM AGGREGATOR SUBSYSTEM
 M:     Maximilian Luz <luzmaximilian@gmail.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -14007,12 +14021,6 @@ F:     include/linux/surface_acpi_notify.h
 F:     include/linux/surface_aggregator/
 F:     include/uapi/linux/surface_aggregator/
 
-MICROSOFT SURFACE SYSTEM AGGREGATOR HUB DRIVER
-M:     Maximilian Luz <luzmaximilian@gmail.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-F:     drivers/platform/surface/surface_aggregator_hub.c
-
 MICROTEK X6 SCANNER
 M:     Oliver Neukum <oliver@neukum.org>
 S:     Maintained
@@ -14178,11 +14186,11 @@ L:    linux-modules@vger.kernel.org
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-next
-F:     include/linux/module.h
 F:     include/linux/kmod.h
+F:     include/linux/module.h
 F:     kernel/module/
-F:     scripts/module*
 F:     lib/test_kmod.c
+F:     scripts/module*
 F:     tools/testing/selftests/kmod/
 
 MONOLITHIC POWER SYSTEM PMIC DRIVER
@@ -14771,6 +14779,7 @@ L:      linux-nfs@vger.kernel.org
 S:     Maintained
 W:     http://client.linux-nfs.org
 T:     git git://git.linux-nfs.org/projects/trondmy/linux-nfs.git
+F:     Documentation/filesystems/nfs/
 F:     fs/lockd/
 F:     fs/nfs/
 F:     fs/nfs_common/
@@ -14780,7 +14789,6 @@ F:      include/linux/sunrpc/
 F:     include/uapi/linux/nfs*
 F:     include/uapi/linux/sunrpc/
 F:     net/sunrpc/
-F:     Documentation/filesystems/nfs/
 
 NILFS2 FILESYSTEM
 M:     Ryusuke Konishi <konishi.ryusuke@gmail.com>
@@ -14984,12 +14992,6 @@ F:     drivers/nvme/target/auth.c
 F:     drivers/nvme/target/fabrics-cmd-auth.c
 F:     include/linux/nvme-auth.h
 
-NVM EXPRESS HARDWARE MONITORING SUPPORT
-M:     Guenter Roeck <linux@roeck-us.net>
-L:     linux-nvme@lists.infradead.org
-S:     Supported
-F:     drivers/nvme/host/hwmon.c
-
 NVM EXPRESS FC TRANSPORT DRIVERS
 M:     James Smart <james.smart@broadcom.com>
 L:     linux-nvme@lists.infradead.org
@@ -15000,6 +15002,12 @@ F:     drivers/nvme/target/fcloop.c
 F:     include/linux/nvme-fc-driver.h
 F:     include/linux/nvme-fc.h
 
+NVM EXPRESS HARDWARE MONITORING SUPPORT
+M:     Guenter Roeck <linux@roeck-us.net>
+L:     linux-nvme@lists.infradead.org
+S:     Supported
+F:     drivers/nvme/host/hwmon.c
+
 NVM EXPRESS TARGET DRIVER
 M:     Christoph Hellwig <hch@lst.de>
 M:     Sagi Grimberg <sagi@grimberg.me>
@@ -15020,6 +15028,13 @@ F:     drivers/nvmem/
 F:     include/linux/nvmem-consumer.h
 F:     include/linux/nvmem-provider.h
 
+NXP BLUETOOTH WIRELESS DRIVERS
+M:     Amitkumar Karwar <amitkumar.karwar@nxp.com>
+M:     Neeraj Kale <neeraj.sanjaykale@nxp.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml
+F:     drivers/bluetooth/btnxpuart.c
+
 NXP C45 TJA11XX PHY DRIVER
 M:     Radu Pirea <radu-nicolae.pirea@oss.nxp.com>
 L:     netdev@vger.kernel.org
@@ -15045,16 +15060,17 @@ F:    drivers/iio/gyro/fxas21002c_core.c
 F:     drivers/iio/gyro/fxas21002c_i2c.c
 F:     drivers/iio/gyro/fxas21002c_spi.c
 
-NXP i.MX CLOCK DRIVERS
-M:     Abel Vesa <abelvesa@kernel.org>
-R:     Peng Fan <peng.fan@nxp.com>
-L:     linux-clk@vger.kernel.org
+NXP i.MX 7D/6SX/6UL/93 AND VF610 ADC DRIVER
+M:     Haibo Chen <haibo.chen@nxp.com>
+L:     linux-iio@vger.kernel.org
 L:     linux-imx@nxp.com
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx
-F:     Documentation/devicetree/bindings/clock/imx*
-F:     drivers/clk/imx/
-F:     include/dt-bindings/clock/imx*
+F:     Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml
+F:     Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml
+F:     Documentation/devicetree/bindings/iio/adc/nxp,imx93-adc.yaml
+F:     drivers/iio/adc/imx7d_adc.c
+F:     drivers/iio/adc/imx93_adc.c
+F:     drivers/iio/adc/vf610_adc.c
 
 NXP i.MX 8M ISI DRIVER
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -15063,6 +15079,15 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
 F:     drivers/media/platform/nxp/imx8-isi/
 
+NXP i.MX 8MP DW100 V4L2 DRIVER
+M:     Xavier Roumegue <xavier.roumegue@oss.nxp.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/media/nxp,dw100.yaml
+F:     Documentation/userspace-api/media/drivers/dw100.rst
+F:     drivers/media/platform/nxp/dw100/
+F:     include/uapi/linux/dw100.h
+
 NXP i.MX 8MQ DCSS DRIVER
 M:     Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>
 R:     Lucas Stach <l.stach@pengutronix.de>
@@ -15080,17 +15105,24 @@ S:    Maintained
 F:     Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml
 F:     drivers/iio/adc/imx8qxp-adc.c
 
-NXP i.MX 7D/6SX/6UL/93 AND VF610 ADC DRIVER
-M:     Haibo Chen <haibo.chen@nxp.com>
-L:     linux-iio@vger.kernel.org
+NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
+M:     Mirela Rabulea <mirela.rabulea@nxp.com>
+R:     NXP Linux Team <linux-imx@nxp.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
+F:     drivers/media/platform/nxp/imx-jpeg
+
+NXP i.MX CLOCK DRIVERS
+M:     Abel Vesa <abelvesa@kernel.org>
+R:     Peng Fan <peng.fan@nxp.com>
+L:     linux-clk@vger.kernel.org
 L:     linux-imx@nxp.com
 S:     Maintained
-F:     Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml
-F:     Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml
-F:     Documentation/devicetree/bindings/iio/adc/nxp,imx93-adc.yaml
-F:     drivers/iio/adc/imx7d_adc.c
-F:     drivers/iio/adc/imx93_adc.c
-F:     drivers/iio/adc/vf610_adc.c
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx
+F:     Documentation/devicetree/bindings/clock/imx*
+F:     drivers/clk/imx/
+F:     include/dt-bindings/clock/imx*
 
 NXP PF8100/PF8121A/PF8200 PMIC REGULATOR DEVICE DRIVER
 M:     Jagan Teki <jagan@amarulasolutions.com>
@@ -15136,34 +15168,17 @@ S:    Maintained
 F:     Documentation/devicetree/bindings/sound/tfa9879.txt
 F:     sound/soc/codecs/tfa9879*
 
-NXP/Goodix TFA989X (TFA1) DRIVER
-M:     Stephan Gerhold <stephan@gerhold.net>
-L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
-S:     Maintained
-F:     Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml
-F:     sound/soc/codecs/tfa989x.c
-
 NXP-NCI NFC DRIVER
 S:     Orphan
 F:     Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
 F:     drivers/nfc/nxp-nci
 
-NXP i.MX 8MP DW100 V4L2 DRIVER
-M:     Xavier Roumegue <xavier.roumegue@oss.nxp.com>
-L:     linux-media@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/media/nxp,dw100.yaml
-F:     Documentation/userspace-api/media/drivers/dw100.rst
-F:     drivers/media/platform/nxp/dw100/
-F:     include/uapi/linux/dw100.h
-
-NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
-M:     Mirela Rabulea <mirela.rabulea@nxp.com>
-R:     NXP Linux Team <linux-imx@nxp.com>
-L:     linux-media@vger.kernel.org
+NXP/Goodix TFA989X (TFA1) DRIVER
+M:     Stephan Gerhold <stephan@gerhold.net>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
-F:     Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
-F:     drivers/media/platform/nxp/imx-jpeg
+F:     Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml
+F:     sound/soc/codecs/tfa989x.c
 
 NZXT-KRAKEN2 HARDWARE MONITORING DRIVER
 M:     Jonas Malaco <jonas@protocubo.io>
@@ -15689,8 +15704,8 @@ M:      Rob Herring <robh+dt@kernel.org>
 M:     Frank Rowand <frowand.list@gmail.com>
 L:     devicetree@vger.kernel.org
 S:     Maintained
-C:     irc://irc.libera.chat/devicetree
 W:     http://www.devicetree.org/
+C:     irc://irc.libera.chat/devicetree
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
 F:     Documentation/ABI/testing/sysfs-firmware-ofw
 F:     drivers/of/
@@ -15706,8 +15721,8 @@ M:      Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
 M:     Conor Dooley <conor+dt@kernel.org>
 L:     devicetree@vger.kernel.org
 S:     Maintained
-C:     irc://irc.libera.chat/devicetree
 Q:     http://patchwork.ozlabs.org/project/devicetree-bindings/list/
+C:     irc://irc.libera.chat/devicetree
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
 F:     Documentation/devicetree/
 F:     arch/*/boot/dts/
@@ -15720,13 +15735,6 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/ptp/ptp_ocp.c
 
-INTEL PTP DFL ToD DRIVER
-M:     Tianfei Zhang <tianfei.zhang@intel.com>
-L:     linux-fpga@vger.kernel.org
-L:     netdev@vger.kernel.org
-S:     Maintained
-F:     drivers/ptp/ptp_dfl_tod.c
-
 OPENCORES I2C BUS DRIVER
 M:     Peter Korsgaard <peter@korsgaard.com>
 M:     Andrew Lunn <andrew@lunn.ch>
@@ -15745,8 +15753,8 @@ L:      linux-openrisc@vger.kernel.org
 S:     Maintained
 W:     http://openrisc.io
 T:     git https://github.com/openrisc/linux.git
-F:     Documentation/devicetree/bindings/openrisc/
 F:     Documentation/arch/openrisc/
+F:     Documentation/devicetree/bindings/openrisc/
 F:     arch/openrisc/
 F:     drivers/irqchip/irq-ompic.c
 F:     drivers/irqchip/irq-or1k-*
@@ -16062,6 +16070,14 @@ L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/pci/controller/dwc/*layerscape*
 
+PCI DRIVER FOR FU740
+M:     Paul Walmsley <paul.walmsley@sifive.com>
+M:     Greentime Hu <greentime.hu@sifive.com>
+L:     linux-pci@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml
+F:     drivers/pci/controller/dwc/pcie-fu740.c
+
 PCI DRIVER FOR GENERIC OF HOSTS
 M:     Will Deacon <will@kernel.org>
 L:     linux-pci@vger.kernel.org
@@ -16082,14 +16098,6 @@ F:     Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml
 F:     Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml
 F:     drivers/pci/controller/dwc/*imx6*
 
-PCI DRIVER FOR FU740
-M:     Paul Walmsley <paul.walmsley@sifive.com>
-M:     Greentime Hu <greentime.hu@sifive.com>
-L:     linux-pci@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml
-F:     drivers/pci/controller/dwc/pcie-fu740.c
-
 PCI DRIVER FOR INTEL IXP4XX
 M:     Linus Walleij <linus.walleij@linaro.org>
 S:     Maintained
@@ -16169,8 +16177,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/snps,dw-pcie.yaml
 F:     Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml
+F:     Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
 F:     drivers/pci/controller/dwc/*designware*
 
 PCI DRIVER FOR TI DRA7XX/J721E
@@ -16190,6 +16198,14 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt
 F:     drivers/pci/controller/pci-v3-semi.c
 
+PCI DRIVER FOR XILINX VERSAL CPM
+M:     Bharat Kumar Gogada <bharat.kumar.gogada@amd.com>
+M:     Michal Simek <michal.simek@amd.com>
+L:     linux-pci@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
+F:     drivers/pci/controller/pcie-xilinx-cpm.c
+
 PCI ENDPOINT SUBSYSTEM
 M:     Lorenzo Pieralisi <lpieralisi@kernel.org>
 M:     Krzysztof WilczyÅ„ski <kw@linux.com>
@@ -16227,19 +16243,6 @@ L:     linux-pci@vger.kernel.org
 S:     Supported
 F:     Documentation/PCI/pci-error-recovery.rst
 
-PCI PEER-TO-PEER DMA (P2PDMA)
-M:     Bjorn Helgaas <bhelgaas@google.com>
-M:     Logan Gunthorpe <logang@deltatee.com>
-L:     linux-pci@vger.kernel.org
-S:     Supported
-Q:     https://patchwork.kernel.org/project/linux-pci/list/
-B:     https://bugzilla.kernel.org
-C:     irc://irc.oftc.net/linux-pci
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
-F:     Documentation/driver-api/pci/p2pdma.rst
-F:     drivers/pci/p2pdma.c
-F:     include/linux/pci-p2pdma.h
-
 PCI MSI DRIVER FOR ALTERA MSI IP
 M:     Joyce Ooi <joyce.ooi@intel.com>
 L:     linux-pci@vger.kernel.org
@@ -16270,6 +16273,19 @@ F:     drivers/pci/controller/
 F:     drivers/pci/pci-bridge-emul.c
 F:     drivers/pci/pci-bridge-emul.h
 
+PCI PEER-TO-PEER DMA (P2PDMA)
+M:     Bjorn Helgaas <bhelgaas@google.com>
+M:     Logan Gunthorpe <logang@deltatee.com>
+L:     linux-pci@vger.kernel.org
+S:     Supported
+Q:     https://patchwork.kernel.org/project/linux-pci/list/
+B:     https://bugzilla.kernel.org
+C:     irc://irc.oftc.net/linux-pci
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
+F:     Documentation/driver-api/pci/p2pdma.rst
+F:     drivers/pci/p2pdma.c
+F:     include/linux/pci-p2pdma.h
+
 PCI SUBSYSTEM
 M:     Bjorn Helgaas <bhelgaas@google.com>
 L:     linux-pci@vger.kernel.org
@@ -16378,14 +16394,6 @@ L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
 F:     drivers/pci/controller/dwc/pcie-qcom.c
 
-PCIE ENDPOINT DRIVER FOR QUALCOMM
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-L:     linux-pci@vger.kernel.org
-L:     linux-arm-msm@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml
-F:     drivers/pci/controller/dwc/pcie-qcom-ep.c
-
 PCIE DRIVER FOR ROCKCHIP
 M:     Shawn Lin <shawn.lin@rock-chips.com>
 L:     linux-pci@vger.kernel.org
@@ -16407,13 +16415,13 @@ L:    linux-pci@vger.kernel.org
 S:     Maintained
 F:     drivers/pci/controller/dwc/*spear*
 
-PCI DRIVER FOR XILINX VERSAL CPM
-M:     Bharat Kumar Gogada <bharat.kumar.gogada@amd.com>
-M:     Michal Simek <michal.simek@amd.com>
+PCIE ENDPOINT DRIVER FOR QUALCOMM
+M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 L:     linux-pci@vger.kernel.org
+L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
-F:     drivers/pci/controller/pcie-xilinx-cpm.c
+F:     Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml
+F:     drivers/pci/controller/dwc/pcie-qcom-ep.c
 
 PCMCIA SUBSYSTEM
 M:     Dominik Brodowski <linux@dominikbrodowski.net>
@@ -16683,9 +16691,9 @@ R:      Alim Akhtar <alim.akhtar@samsung.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-samsung-soc@vger.kernel.org
 S:     Maintained
-C:     irc://irc.libera.chat/linux-exynos
 Q:     https://patchwork.kernel.org/project/linux-samsung-soc/list/
 B:     mailto:linux-samsung-soc@vger.kernel.org
+C:     irc://irc.libera.chat/linux-exynos
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
 F:     Documentation/devicetree/bindings/pinctrl/samsung,pinctrl*yaml
 F:     drivers/pinctrl/samsung/
@@ -16747,13 +16755,6 @@ M:     Logan Gunthorpe <logang@deltatee.com>
 S:     Maintained
 F:     drivers/dma/plx_dma.c
 
-PM6764TR DRIVER
-M:     Charles Hsu     <hsu.yungteng@gmail.com>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/hwmon/pm6764tr.rst
-F:     drivers/hwmon/pmbus/pm6764tr.c
-
 PM-GRAPH UTILITY
 M:     "Todd E Brandt" <todd.e.brandt@linux.intel.com>
 L:     linux-pm@vger.kernel.org
@@ -16763,6 +16764,13 @@ B:     https://bugzilla.kernel.org/buglist.cgi?component=pm-graph&product=Tools
 T:     git git://github.com/intel/pm-graph
 F:     tools/power/pm-graph
 
+PM6764TR DRIVER
+M:     Charles Hsu     <hsu.yungteng@gmail.com>
+L:     linux-hwmon@vger.kernel.org
+S:     Maintained
+F:     Documentation/hwmon/pm6764tr.rst
+F:     drivers/hwmon/pmbus/pm6764tr.c
+
 PMBUS HARDWARE MONITORING DRIVERS
 M:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-hwmon@vger.kernel.org
@@ -16843,15 +16851,6 @@ F:     include/linux/pm_*
 F:     include/linux/powercap.h
 F:     kernel/configs/nopm.config
 
-DYNAMIC THERMAL POWER MANAGEMENT (DTPM)
-M:     Daniel Lezcano <daniel.lezcano@kernel.org>
-L:     linux-pm@vger.kernel.org
-S:     Supported
-B:     https://bugzilla.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
-F:     drivers/powercap/dtpm*
-F:     include/linux/dtpm.h
-
 POWER STATE COORDINATION INTERFACE (PSCI)
 M:     Mark Rutland <mark.rutland@arm.com>
 M:     Lorenzo Pieralisi <lpieralisi@kernel.org>
@@ -17010,8 +17009,8 @@ R:      Guilherme G. Piccoli <gpiccoli@igalia.com>
 L:     linux-hardening@vger.kernel.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/pstore
-F:     Documentation/admin-guide/ramoops.rst
 F:     Documentation/admin-guide/pstore-blk.rst
+F:     Documentation/admin-guide/ramoops.rst
 F:     Documentation/devicetree/bindings/reserved-memory/ramoops.yaml
 F:     drivers/acpi/apei/erst.c
 F:     drivers/firmware/efi/efi-pstore.c
@@ -17160,10 +17159,10 @@ F:    sound/soc/codecs/lpass-va-macro.c
 F:     sound/soc/codecs/lpass-wsa-macro.*
 F:     sound/soc/codecs/msm8916-wcd-analog.c
 F:     sound/soc/codecs/msm8916-wcd-digital.c
-F:     sound/soc/codecs/wcd9335.*
-F:     sound/soc/codecs/wcd934x.c
 F:     sound/soc/codecs/wcd-clsh-v2.*
 F:     sound/soc/codecs/wcd-mbhc-v2.*
+F:     sound/soc/codecs/wcd9335.*
+F:     sound/soc/codecs/wcd934x.c
 F:     sound/soc/codecs/wsa881x.c
 F:     sound/soc/codecs/wsa883x.c
 F:     sound/soc/qcom/
@@ -17320,14 +17319,21 @@ Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 T:     git git://linuxtv.org/anttip/media_tree.git
 F:     drivers/media/tuners/qt1010*
 
+QUALCOMM ATH12K WIRELESS DRIVER
+M:     Kalle Valo <kvalo@kernel.org>
+L:     ath12k@lists.infradead.org
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
+F:     drivers/net/wireless/ath/ath12k/
+
 QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
 M:     Kalle Valo <kvalo@kernel.org>
 L:     ath10k@lists.infradead.org
 S:     Supported
 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.yaml
+F:     drivers/net/wireless/ath/ath10k/
 
 QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
 M:     Kalle Valo <kvalo@kernel.org>
@@ -17337,13 +17343,6 @@ 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 ATH12K WIRELESS DRIVER
-M:     Kalle Valo <kvalo@kernel.org>
-L:     ath12k@lists.infradead.org
-S:     Supported
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
-F:     drivers/net/wireless/ath/ath12k/
-
 QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
 M:     Toke Høiland-Jørgensen <toke@toke.dk>
 L:     linux-wireless@vger.kernel.org
@@ -17440,8 +17439,8 @@ F:      include/uapi/misc/fastrpc.h
 QUALCOMM HEXAGON ARCHITECTURE
 M:     Brian Cain <bcain@quicinc.com>
 L:     linux-hexagon@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bcain/linux.git
 S:     Supported
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bcain/linux.git
 F:     arch/hexagon/
 
 QUALCOMM HIDMA DRIVER
@@ -17563,9 +17562,9 @@ M:      Christian König <christian.koenig@amd.com>
 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
+T:     git https://gitlab.freedesktop.org/agd5f/linux.git
 F:     Documentation/gpu/amdgpu/
 F:     drivers/gpu/drm/amd/
 F:     drivers/gpu/drm/radeon/
@@ -17653,8 +17652,8 @@ F:      arch/mips/generic/board-ranchu.c
 RANDOM NUMBER DRIVER
 M:     "Theodore Ts'o" <tytso@mit.edu>
 M:     Jason A. Donenfeld <Jason@zx2c4.com>
-T:     git https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git
 S:     Maintained
+T:     git https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git
 F:     drivers/char/random.c
 F:     drivers/virt/vmgenid.c
 
@@ -17688,8 +17687,8 @@ T:      git git://linuxtv.org/media_tree.git
 F:     Documentation/driver-api/media/rc-core.rst
 F:     Documentation/userspace-api/media/rc/
 F:     drivers/media/rc/
-F:     include/media/rc-map.h
 F:     include/media/rc-core.h
+F:     include/media/rc-map.h
 F:     include/uapi/linux/lirc.h
 
 RCMM REMOTE CONTROLS DECODER
@@ -17806,6 +17805,14 @@ F:     include/linux/rtc/
 F:     include/uapi/linux/rtc.h
 F:     tools/testing/selftests/rtc/
 
+Real-time Linux Analysis (RTLA) tools
+M:     Daniel Bristot de Oliveira <bristot@kernel.org>
+M:     Steven Rostedt <rostedt@goodmis.org>
+L:     linux-trace-devel@vger.kernel.org
+S:     Maintained
+F:     Documentation/tools/rtla/
+F:     tools/tracing/rtla/
+
 REALTEK AUDIO CODECS
 M:     Oder Chiou <oder_chiou@realtek.com>
 S:     Maintained
@@ -17929,6 +17936,14 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/sound/renesas,idt821034.yaml
 F:     sound/soc/codecs/idt821034.c
 
+RENESAS R-CAR GEN3 & RZ/N1 NAND CONTROLLER DRIVER
+M:     Miquel Raynal <miquel.raynal@bootlin.com>
+L:     linux-mtd@lists.infradead.org
+L:     linux-renesas-soc@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/mtd/renesas-nandc.yaml
+F:     drivers/mtd/nand/raw/renesas-nand-controller.c
+
 RENESAS R-CAR GYROADC DRIVER
 M:     Marek Vasut <marek.vasut@gmail.com>
 L:     linux-iio@vger.kernel.org
@@ -17947,9 +17962,9 @@ F:      drivers/i2c/busses/i2c-sh_mobile.c
 
 RENESAS R-CAR SATA DRIVER
 R:     Sergey Shtylyov <s.shtylyov@omp.ru>
-S:     Supported
 L:     linux-ide@vger.kernel.org
 L:     linux-renesas-soc@vger.kernel.org
+S:     Supported
 F:     Documentation/devicetree/bindings/ata/renesas,rcar-sata.yaml
 F:     drivers/ata/sata_rcar.c
 
@@ -17969,12 +17984,6 @@ S:     Supported
 F:     Documentation/devicetree/bindings/i2c/renesas,riic.yaml
 F:     drivers/i2c/busses/i2c-riic.c
 
-RENESAS USB PHY DRIVER
-M:     Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
-L:     linux-renesas-soc@vger.kernel.org
-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
@@ -18020,13 +18029,11 @@ S:    Maintained
 F:     Documentation/devicetree/bindings/usb/renesas,rzn1-usbf.yaml
 F:     drivers/usb/gadget/udc/renesas_usbf.c
 
-RENESAS R-CAR GEN3 & RZ/N1 NAND CONTROLLER DRIVER
-M:     Miquel Raynal <miquel.raynal@bootlin.com>
-L:     linux-mtd@lists.infradead.org
+RENESAS USB PHY DRIVER
+M:     Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
 L:     linux-renesas-soc@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/mtd/renesas-nandc.yaml
-F:     drivers/mtd/nand/raw/renesas-nand-controller.c
+F:     drivers/phy/renesas/phy-rcar-gen3-usb*.c
 
 RENESAS VERSACLOCK 7 CLOCK DRIVER
 M:     Alex Helms <alexander.helms.jy@renesas.com>
@@ -18094,15 +18101,6 @@ S:     Maintained
 F:     drivers/mtd/nand/raw/r852.c
 F:     drivers/mtd/nand/raw/r852.h
 
-RISC-V PMU DRIVERS
-M:     Atish Patra <atishp@atishpatra.org>
-R:     Anup Patel <anup@brainfault.org>
-L:     linux-riscv@lists.infradead.org
-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 <paul.walmsley@sifive.com>
 M:     Palmer Dabbelt <palmer@dabbelt.com>
@@ -18155,6 +18153,15 @@ T:     git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
 F:     Documentation/devicetree/bindings/riscv/
 F:     arch/riscv/boot/dts/
 
+RISC-V PMU DRIVERS
+M:     Atish Patra <atishp@atishpatra.org>
+R:     Anup Patel <anup@brainfault.org>
+L:     linux-riscv@lists.infradead.org
+S:     Supported
+F:     drivers/perf/riscv_pmu.c
+F:     drivers/perf/riscv_pmu_legacy.c
+F:     drivers/perf/riscv_pmu_sbi.c
+
 RNBD BLOCK DRIVERS
 M:     Md. Haris Iqbal <haris.iqbal@ionos.com>
 M:     Jack Wang <jinpu.wang@ionos.com>
@@ -18459,14 +18466,6 @@ F:     drivers/s390/net/*iucv*
 F:     include/net/iucv/
 F:     net/iucv/
 
-S390 NETWORK DRIVERS
-M:     Alexandra Winter <wintera@linux.ibm.com>
-M:     Wenjia Zhang <wenjia@linux.ibm.com>
-L:     linux-s390@vger.kernel.org
-L:     netdev@vger.kernel.org
-S:     Supported
-F:     drivers/s390/net/
-
 S390 MM
 M:     Alexander Gordeev <agordeev@linux.ibm.com>
 M:     Gerald Schaefer <gerald.schaefer@linux.ibm.com>
@@ -18476,14 +18475,22 @@ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
 F:     arch/s390/include/asm/pgtable.h
 F:     arch/s390/mm
 
+S390 NETWORK DRIVERS
+M:     Alexandra Winter <wintera@linux.ibm.com>
+M:     Wenjia Zhang <wenjia@linux.ibm.com>
+L:     linux-s390@vger.kernel.org
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/s390/net/
+
 S390 PCI SUBSYSTEM
 M:     Niklas Schnelle <schnelle@linux.ibm.com>
 M:     Gerald Schaefer <gerald.schaefer@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
+F:     Documentation/s390/pci.rst
 F:     arch/s390/pci/
 F:     drivers/pci/hotplug/s390_pci_hpc.c
-F:     Documentation/s390/pci.rst
 
 S390 SCM DRIVER
 M:     Vineeth Vijayan <vneethv@linux.ibm.com>
@@ -18916,6 +18923,13 @@ L:     linux-mmc@vger.kernel.org
 S:     Supported
 F:     drivers/mmc/host/sdhci-of-at91.c
 
+SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) NXP i.MX DRIVER
+M:     Haibo Chen <haibo.chen@nxp.com>
+L:     linux-imx@nxp.com
+L:     linux-mmc@vger.kernel.org
+S:     Maintained
+F:     drivers/mmc/host/sdhci-esdhc-imx.c
+
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
 M:     Ben Dooks <ben-linux@fluff.org>
 M:     Jaehoon Chung <jh80.chung@samsung.com>
@@ -18935,13 +18949,6 @@ L:     linux-mmc@vger.kernel.org
 S:     Maintained
 F:     drivers/mmc/host/sdhci-omap.c
 
-SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) NXP i.MX DRIVER
-M:     Haibo Chen <haibo.chen@nxp.com>
-L:     linux-imx@nxp.com
-L:     linux-mmc@vger.kernel.org
-S:     Maintained
-F:     drivers/mmc/host/sdhci-esdhc-imx.c
-
 SECURE ENCRYPTING DEVICE (SED) OPAL DRIVER
 M:     Jonathan Derrick <jonathan.derrick@linux.dev>
 L:     linux-block@vger.kernel.org
@@ -18951,6 +18958,15 @@ F:     block/sed*
 F:     include/linux/sed*
 F:     include/uapi/linux/sed*
 
+SECURE MONITOR CALL(SMC) CALLING CONVENTION (SMCCC)
+M:     Mark Rutland <mark.rutland@arm.com>
+M:     Lorenzo Pieralisi <lpieralisi@kernel.org>
+M:     Sudeep Holla <sudeep.holla@arm.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     drivers/firmware/smccc/
+F:     include/linux/arm-smccc.h
+
 SECURITY CONTACT
 M:     Security Officers <security@kernel.org>
 S:     Supported
@@ -19400,15 +19416,6 @@ M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Odd Fixes
 F:     drivers/net/ethernet/smsc/smc91x.*
 
-SECURE MONITOR CALL(SMC) CALLING CONVENTION (SMCCC)
-M:     Mark Rutland <mark.rutland@arm.com>
-M:     Lorenzo Pieralisi <lpieralisi@kernel.org>
-M:     Sudeep Holla <sudeep.holla@arm.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Maintained
-F:     drivers/firmware/smccc/
-F:     include/linux/arm-smccc.h
-
 SMM665 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-hwmon@vger.kernel.org
@@ -19456,6 +19463,10 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/smsc/smsc9420.*
 
+SNET DPU VIRTIO DATA PATH ACCELERATOR
+R:     Alvaro Karsz <alvaro.karsz@solid-run.com>
+F:     drivers/vdpa/solidrun/
+
 SOCIONEXT (SNI) AVE NETWORK DRIVER
 M:     Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
 L:     netdev@vger.kernel.org
@@ -19725,6 +19736,13 @@ F:     include/uapi/sound/
 F:     sound/
 F:     tools/testing/selftests/alsa
 
+SOUND - ALSA SELFTESTS
+M:     Mark Brown <broonie@kernel.org>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+L:     linux-kselftest@vger.kernel.org
+S:     Supported
+F:     tools/testing/selftests/alsa
+
 SOUND - COMPRESSED AUDIO
 M:     Vinod Koul <vkoul@kernel.org>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -19743,13 +19761,6 @@ F:     include/sound/dmaengine_pcm.h
 F:     sound/core/pcm_dmaengine.c
 F:     sound/soc/soc-generic-dmaengine-pcm.c
 
-SOUND - ALSA SELFTESTS
-M:     Mark Brown <broonie@kernel.org>
-L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
-L:     linux-kselftest@vger.kernel.org
-S:     Supported
-F:     tools/testing/selftests/alsa
-
 SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
 M:     Liam Girdwood <lgirdwood@gmail.com>
 M:     Mark Brown <broonie@kernel.org>
@@ -19769,8 +19780,8 @@ M:      Liam Girdwood <lgirdwood@gmail.com>
 M:     Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
 M:     Bard Liao <yung-chuan.liao@linux.intel.com>
 M:     Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
-R:     Kai Vehmanen <kai.vehmanen@linux.intel.com>
 M:     Daniel Baluta <daniel.baluta@nxp.com>
+R:     Kai Vehmanen <kai.vehmanen@linux.intel.com>
 L:     sound-open-firmware@alsa-project.org (moderated for non-subscribers)
 S:     Supported
 W:     https://github.com/thesofproject/linux/
@@ -19832,9 +19843,9 @@ M:      "Luc Van Oostenryck" <luc.vanoostenryck@gmail.com>
 L:     linux-sparse@vger.kernel.org
 S:     Maintained
 W:     https://sparse.docs.kernel.org/
-T:     git git://git.kernel.org/pub/scm/devel/sparse/sparse.git
 Q:     https://patchwork.kernel.org/project/linux-sparse/list/
 B:     https://bugzilla.kernel.org/enter_bug.cgi?component=Sparse&product=Tools
+T:     git git://git.kernel.org/pub/scm/devel/sparse/sparse.git
 F:     include/linux/compiler.h
 
 SPEAKUP CONSOLE SPEECH DRIVER
@@ -20203,6 +20214,11 @@ W:     http://www.stlinux.com
 F:     Documentation/networking/device_drivers/ethernet/stmicro/
 F:     drivers/net/ethernet/stmicro/stmmac/
 
+SUN HAPPY MEAL ETHERNET DRIVER
+M:     Sean Anderson <seanga2@gmail.com>
+S:     Maintained
+F:     drivers/net/ethernet/sun/sunhme.*
+
 SUN3/3X
 M:     Sam Creasey <sammy@sammy.net>
 S:     Maintained
@@ -20225,11 +20241,6 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/dlink/sundance.c
 
-SUN HAPPY MEAL ETHERNET DRIVER
-M:     Sean Anderson <seanga2@gmail.com>
-S:     Maintained
-F:     drivers/net/ethernet/sun/sunhme.*
-
 SUNPLUS ETHERNET DRIVER
 M:     Wells Lu <wellslutw@gmail.com>
 L:     netdev@vger.kernel.org
@@ -20251,15 +20262,6 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml
 F:     drivers/nvmem/sunplus-ocotp.c
 
-SUNPLUS USB2 PHY DRIVER
-M:     Vincent Shih <vincent.sunplus@gmail.com>
-L:     linux-usb@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/phy/sunplus,sp7021-usb2-phy.yaml
-F:     drivers/phy/sunplus/Kconfig
-F:     drivers/phy/sunplus/Makefile
-F:     drivers/phy/sunplus/phy-sunplus-usb2.c
-
 SUNPLUS PWM DRIVER
 M:     Hammer Hsieh <hammerh0314@gmail.com>
 S:     Maintained
@@ -20286,6 +20288,15 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/serial/sunplus,sp7021-uart.yaml
 F:     drivers/tty/serial/sunplus-uart.c
 
+SUNPLUS USB2 PHY DRIVER
+M:     Vincent Shih <vincent.sunplus@gmail.com>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/phy/sunplus,sp7021-usb2-phy.yaml
+F:     drivers/phy/sunplus/Kconfig
+F:     drivers/phy/sunplus/Makefile
+F:     drivers/phy/sunplus/phy-sunplus-usb2.c
+
 SUNPLUS WATCHDOG DRIVER
 M:     Xiantao Hu <xt.hu@cqplus1.com>
 L:     linux-watchdog@vger.kernel.org
@@ -20697,6 +20708,14 @@ F:     include/linux/if_team.h
 F:     include/uapi/linux/if_team.h
 F:     tools/testing/selftests/drivers/net/team/
 
+TECHNICAL ADVISORY BOARD PROCESS DOCS
+M:     "Theodore Ts'o" <tytso@mit.edu>
+M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+L:     tech-board-discuss@lists.linux-foundation.org
+S:     Maintained
+F:     Documentation/process/contribution-maturity-model.rst
+F:     Documentation/process/researcher-guidelines.rst
+
 TECHNOLOGIC SYSTEMS TS-5500 PLATFORM SUPPORT
 M:     "Savoir-faire Linux Inc." <kernel@savoirfairelinux.com>
 S:     Maintained
@@ -20776,6 +20795,14 @@ M:     Thierry Reding <thierry.reding@gmail.com>
 S:     Supported
 F:     drivers/pwm/pwm-tegra.c
 
+TEGRA QUAD SPI DRIVER
+M:     Thierry Reding <thierry.reding@gmail.com>
+M:     Jonathan Hunter <jonathanh@nvidia.com>
+M:     Sowjanya Komatineni <skomatineni@nvidia.com>
+L:     linux-tegra@vger.kernel.org
+S:     Maintained
+F:     drivers/spi/spi-tegra210-quad.c
+
 TEGRA SERIAL DRIVER
 M:     Laxman Dewangan <ldewangan@nvidia.com>
 S:     Supported
@@ -20786,14 +20813,6 @@ M:     Laxman Dewangan <ldewangan@nvidia.com>
 S:     Supported
 F:     drivers/spi/spi-tegra*
 
-TEGRA QUAD SPI DRIVER
-M:     Thierry Reding <thierry.reding@gmail.com>
-M:     Jonathan Hunter <jonathanh@nvidia.com>
-M:     Sowjanya Komatineni <skomatineni@nvidia.com>
-L:     linux-tegra@vger.kernel.org
-S:     Maintained
-F:     drivers/spi/spi-tegra210-quad.c
-
 TEGRA VIDEO DRIVER
 M:     Thierry Reding <thierry.reding@gmail.com>
 M:     Jonathan Hunter <jonathanh@nvidia.com>
@@ -20842,13 +20861,6 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
 F:     sound/soc/ti/
 
-TEXAS INSTRUMENTS' DAC7612 DAC DRIVER
-M:     Ricardo Ribalda <ribalda@kernel.org>
-L:     linux-iio@vger.kernel.org
-S:     Supported
-F:     Documentation/devicetree/bindings/iio/dac/ti,dac7612.yaml
-F:     drivers/iio/dac/ti-dac7612.c
-
 TEXAS INSTRUMENTS DMA DRIVERS
 M:     Peter Ujfalusi <peter.ujfalusi@gmail.com>
 L:     dmaengine@vger.kernel.org
@@ -20857,10 +20869,26 @@ F:    Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt
 F:     Documentation/devicetree/bindings/dma/ti-edma.txt
 F:     Documentation/devicetree/bindings/dma/ti/
 F:     drivers/dma/ti/
-X:     drivers/dma/ti/cppi41.c
+F:     include/linux/dma/k3-psil.h
 F:     include/linux/dma/k3-udma-glue.h
 F:     include/linux/dma/ti-cppi5.h
-F:     include/linux/dma/k3-psil.h
+X:     drivers/dma/ti/cppi41.c
+
+TEXAS INSTRUMENTS TPS23861 PoE PSE DRIVER
+M:     Robert Marko <robert.marko@sartura.hr>
+M:     Luka Perkov <luka.perkov@sartura.hr>
+L:     linux-hwmon@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/hwmon/ti,tps23861.yaml
+F:     Documentation/hwmon/tps23861.rst
+F:     drivers/hwmon/tps23861.c
+
+TEXAS INSTRUMENTS' DAC7612 DAC DRIVER
+M:     Ricardo Ribalda <ribalda@kernel.org>
+L:     linux-iio@vger.kernel.org
+S:     Supported
+F:     Documentation/devicetree/bindings/iio/dac/ti,dac7612.yaml
+F:     drivers/iio/dac/ti-dac7612.c
 
 TEXAS INSTRUMENTS' SYSTEM CONTROL INTERFACE (TISCI) PROTOCOL DRIVER
 M:     Nishanth Menon <nm@ti.com>
@@ -20886,15 +20914,6 @@ F:     include/dt-bindings/soc/ti,sci_pm_domain.h
 F:     include/linux/soc/ti/ti_sci_inta_msi.h
 F:     include/linux/soc/ti/ti_sci_protocol.h
 
-TEXAS INSTRUMENTS TPS23861 PoE PSE DRIVER
-M:     Robert Marko <robert.marko@sartura.hr>
-M:     Luka Perkov <luka.perkov@sartura.hr>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/devicetree/bindings/hwmon/ti,tps23861.yaml
-F:     Documentation/hwmon/tps23861.rst
-F:     drivers/hwmon/tps23861.c
-
 TEXAS INSTRUMENTS' TMP117 TEMPERATURE SENSOR DRIVER
 M:     Puranjay Mohan <puranjay12@gmail.com>
 L:     linux-iio@vger.kernel.org
@@ -21371,8 +21390,8 @@ M:      Steven Rostedt <rostedt@goodmis.org>
 M:     Masami Hiramatsu <mhiramat@kernel.org>
 L:     linux-kernel@vger.kernel.org
 L:     linux-trace-kernel@vger.kernel.org
-Q:     https://patchwork.kernel.org/project/linux-trace-kernel/list/
 S:     Maintained
+Q:     https://patchwork.kernel.org/project/linux-trace-kernel/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
 F:     Documentation/trace/*
 F:     fs/tracefs/
@@ -21400,31 +21419,15 @@ TRACING OS NOISE / LATENCY TRACERS
 M:     Steven Rostedt <rostedt@goodmis.org>
 M:     Daniel Bristot de Oliveira <bristot@kernel.org>
 S:     Maintained
-F:     kernel/trace/trace_osnoise.c
+F:     Documentation/trace/hwlat_detector.rst
+F:     Documentation/trace/osnoise-tracer.rst
+F:     Documentation/trace/timerlat-tracer.rst
+F:     arch/*/kernel/trace.c
 F:     include/trace/events/osnoise.h
 F:     kernel/trace/trace_hwlat.c
 F:     kernel/trace/trace_irqsoff.c
+F:     kernel/trace/trace_osnoise.c
 F:     kernel/trace/trace_sched_wakeup.c
-F:     Documentation/trace/osnoise-tracer.rst
-F:     Documentation/trace/timerlat-tracer.rst
-F:     Documentation/trace/hwlat_detector.rst
-F:     arch/*/kernel/trace.c
-
-Real-time Linux Analysis (RTLA) tools
-M:     Daniel Bristot de Oliveira <bristot@kernel.org>
-M:     Steven Rostedt <rostedt@goodmis.org>
-L:     linux-trace-devel@vger.kernel.org
-S:     Maintained
-F:     Documentation/tools/rtla/
-F:     tools/tracing/rtla/
-
-TECHNICAL ADVISORY BOARD PROCESS DOCS
-M:     "Theodore Ts'o" <tytso@mit.edu>
-M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-L:     tech-board-discuss@lists.linux-foundation.org
-S:     Maintained
-F:     Documentation/process/researcher-guidelines.rst
-F:     Documentation/process/contribution-maturity-model.rst
 
 TRADITIONAL CHINESE DOCUMENTATION
 M:     Hu Haowen <src.res@email.cn>
@@ -21782,8 +21785,8 @@ USB ISP1760 DRIVER
 M:     Rui Miguel Silva <rui.silva@linaro.org>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
-F:     drivers/usb/isp1760/*
 F:     Documentation/devicetree/bindings/usb/nxp,isp1760.yaml
+F:     drivers/usb/isp1760/*
 
 USB LAN78XX ETHERNET DRIVER
 M:     Woojung Huh <woojung.huh@microchip.com>
@@ -21854,6 +21857,13 @@ L:     linux-usb@vger.kernel.org
 S:     Supported
 F:     drivers/usb/class/usblp.c
 
+USB QMI WWAN NETWORK DRIVER
+M:     Bjørn Mork <bjorn@mork.no>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     Documentation/ABI/testing/sysfs-class-net-qmi
+F:     drivers/net/usb/qmi_wwan.c
+
 USB RAW GADGET DRIVER
 R:     Andrey Konovalov <andreyknvl@gmail.com>
 L:     linux-usb@vger.kernel.org
@@ -21862,13 +21872,6 @@ F:     Documentation/usb/raw-gadget.rst
 F:     drivers/usb/gadget/legacy/raw_gadget.c
 F:     include/uapi/linux/usb/raw_gadget.h
 
-USB QMI WWAN NETWORK DRIVER
-M:     Bjørn Mork <bjorn@mork.no>
-L:     netdev@vger.kernel.org
-S:     Maintained
-F:     Documentation/ABI/testing/sysfs-class-net-qmi
-F:     drivers/net/usb/qmi_wwan.c
-
 USB RTL8150 DRIVER
 M:     Petko Manolov <petkan@nucleusys.com>
 L:     linux-usb@vger.kernel.org
@@ -22120,6 +22123,12 @@ F:     drivers/vfio/mdev/
 F:     include/linux/mdev.h
 F:     samples/vfio-mdev/
 
+VFIO MLX5 PCI DRIVER
+M:     Yishai Hadas <yishaih@nvidia.com>
+L:     kvm@vger.kernel.org
+S:     Maintained
+F:     drivers/vfio/pci/mlx5/
+
 VFIO PCI DEVICE SPECIFIC DRIVERS
 R:     Jason Gunthorpe <jgg@nvidia.com>
 R:     Yishai Hadas <yishaih@nvidia.com>
@@ -22136,12 +22145,6 @@ L:     kvm@vger.kernel.org
 S:     Maintained
 F:     drivers/vfio/platform/
 
-VFIO MLX5 PCI DRIVER
-M:     Yishai Hadas <yishaih@nvidia.com>
-L:     kvm@vger.kernel.org
-S:     Maintained
-F:     drivers/vfio/pci/mlx5/
-
 VGA_SWITCHEROO
 R:     Lukas Wunner <lukas@wunner.de>
 S:     Maintained
@@ -22151,8 +22154,8 @@ F:      drivers/gpu/vga/vga_switcheroo.c
 F:     include/linux/vga_switcheroo.h
 
 VIA RHINE NETWORK DRIVER
-S:     Maintained
 M:     Kevin Brace <kevinbrace@bracecomputerlab.com>
+S:     Maintained
 F:     drivers/net/ethernet/via/via-rhine.c
 
 VIA SD/MMC CARD CONTROLLER DRIVER
@@ -22204,6 +22207,14 @@ S:     Maintained
 F:     drivers/media/common/videobuf2/*
 F:     include/media/videobuf2-*
 
+VIDTV VIRTUAL DIGITAL TV DRIVER
+M:     Daniel W. S. Almeida <dwlsalmeida@gmail.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+W:     https://linuxtv.org
+T:     git git://linuxtv.org/media_tree.git
+F:     drivers/media/test-drivers/vidtv/*
+
 VIMC VIRTUAL MEDIA CONTROLLER DRIVER
 M:     Shuah Khan <skhan@linuxfoundation.org>
 R:     Kieran Bingham <kieran.bingham@ideasonboard.com>
@@ -22233,6 +22244,16 @@ F:     include/uapi/linux/virtio_vsock.h
 F:     net/vmw_vsock/virtio_transport.c
 F:     net/vmw_vsock/virtio_transport_common.c
 
+VIRTIO BALLOON
+M:     "Michael S. Tsirkin" <mst@redhat.com>
+M:     David Hildenbrand <david@redhat.com>
+L:     virtualization@lists.linux-foundation.org
+S:     Maintained
+F:     drivers/virtio/virtio_balloon.c
+F:     include/linux/balloon_compaction.h
+F:     include/uapi/linux/virtio_balloon.h
+F:     mm/balloon_compaction.c
+
 VIRTIO BLOCK AND SCSI DRIVERS
 M:     "Michael S. Tsirkin" <mst@redhat.com>
 M:     Jason Wang <jasowang@redhat.com>
@@ -22275,30 +22296,6 @@ F:     include/linux/vringh.h
 F:     include/uapi/linux/virtio_*.h
 F:     tools/virtio/
 
-VISL VIRTUAL STATELESS DECODER DRIVER
-M:     Daniel Almeida <daniel.almeida@collabora.com>
-L:     linux-media@vger.kernel.org
-S:     Supported
-F:     drivers/media/test-drivers/visl
-
-IFCVF VIRTIO DATA PATH ACCELERATOR
-R:     Zhu Lingshan <lingshan.zhu@intel.com>
-F:     drivers/vdpa/ifcvf/
-
-SNET DPU VIRTIO DATA PATH ACCELERATOR
-R:     Alvaro Karsz <alvaro.karsz@solid-run.com>
-F:     drivers/vdpa/solidrun/
-
-VIRTIO BALLOON
-M:     "Michael S. Tsirkin" <mst@redhat.com>
-M:     David Hildenbrand <david@redhat.com>
-L:     virtualization@lists.linux-foundation.org
-S:     Maintained
-F:     drivers/virtio/virtio_balloon.c
-F:     include/uapi/linux/virtio_balloon.h
-F:     include/linux/balloon_compaction.h
-F:     mm/balloon_compaction.c
-
 VIRTIO CRYPTO DRIVER
 M:     Gonglei <arei.gonglei@huawei.com>
 L:     virtualization@lists.linux-foundation.org
@@ -22359,11 +22356,20 @@ L:    virtualization@lists.linux-foundation.org
 L:     netdev@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
-F:     kernel/vhost_task.c
 F:     drivers/vhost/
 F:     include/linux/sched/vhost_task.h
 F:     include/linux/vhost_iotlb.h
 F:     include/uapi/linux/vhost.h
+F:     kernel/vhost_task.c
+
+VIRTIO I2C DRIVER
+M:     Conghui Chen <conghui.chen@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
 
 VIRTIO INPUT DRIVER
 M:     Gerd Hoffmann <kraxel@redhat.com>
@@ -22386,6 +22392,13 @@ W:     https://virtio-mem.gitlab.io/
 F:     drivers/virtio/virtio_mem.c
 F:     include/uapi/linux/virtio_mem.h
 
+VIRTIO PMEM DRIVER
+M:     Pankaj Gupta <pankaj.gupta.linux@gmail.com>
+L:     virtualization@lists.linux-foundation.org
+S:     Maintained
+F:     drivers/nvdimm/nd_virtio.c
+F:     drivers/nvdimm/virtio_pmem.c
+
 VIRTIO SOUND DRIVER
 M:     Anton Yakovlev <anton.yakovlev@opensynergy.com>
 M:     "Michael S. Tsirkin" <mst@redhat.com>
@@ -22395,22 +22408,6 @@ S:     Maintained
 F:     include/uapi/linux/virtio_snd.h
 F:     sound/virtio/*
 
-VIRTIO I2C DRIVER
-M:     Conghui Chen <conghui.chen@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
-
-VIRTIO PMEM DRIVER
-M:     Pankaj Gupta <pankaj.gupta.linux@gmail.com>
-L:     virtualization@lists.linux-foundation.org
-S:     Maintained
-F:     drivers/nvdimm/virtio_pmem.c
-F:     drivers/nvdimm/nd_virtio.c
-
 VIRTUAL BOX GUEST DEVICE DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 M:     Arnd Bergmann <arnd@arndb.de>
@@ -22432,6 +22429,12 @@ S:     Maintained
 F:     drivers/input/serio/userio.c
 F:     include/uapi/linux/userio.h
 
+VISL VIRTUAL STATELESS DECODER DRIVER
+M:     Daniel Almeida <daniel.almeida@collabora.com>
+L:     linux-media@vger.kernel.org
+S:     Supported
+F:     drivers/media/test-drivers/visl
+
 VIVID VIRTUAL VIDEO DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org
@@ -22440,14 +22443,6 @@ W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 F:     drivers/media/test-drivers/vivid/*
 
-VIDTV VIRTUAL DIGITAL TV DRIVER
-M:     Daniel W. S. Almeida <dwlsalmeida@gmail.com>
-L:     linux-media@vger.kernel.org
-S:     Maintained
-W:     https://linuxtv.org
-T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/test-drivers/vidtv/*
-
 VLYNQ BUS
 M:     Florian Fainelli <f.fainelli@gmail.com>
 L:     openwrt-devel@lists.openwrt.org (subscribers-only)
@@ -22455,16 +22450,6 @@ S:     Maintained
 F:     drivers/vlynq/vlynq.c
 F:     include/linux/vlynq.h
 
-VME SUBSYSTEM
-M:     Martyn Welch <martyn@welchs.me.uk>
-M:     Manohar Vanga <manohar.vanga@gmail.com>
-M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-L:     linux-kernel@vger.kernel.org
-S:     Odd fixes
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
-F:     Documentation/driver-api/vme.rst
-F:     drivers/staging/vme_user/
-
 VM SOCKETS (AF_VSOCK)
 M:     Stefano Garzarella <sgarzare@redhat.com>
 L:     virtualization@lists.linux-foundation.org
@@ -22478,6 +22463,28 @@ F:     include/uapi/linux/vsockmon.h
 F:     net/vmw_vsock/
 F:     tools/testing/vsock/
 
+VMALLOC
+M:     Andrew Morton <akpm@linux-foundation.org>
+R:     Uladzislau Rezki <urezki@gmail.com>
+R:     Christoph Hellwig <hch@infradead.org>
+R:     Lorenzo Stoakes <lstoakes@gmail.com>
+L:     linux-mm@kvack.org
+S:     Maintained
+W:     http://www.linux-mm.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+F:     include/linux/vmalloc.h
+F:     mm/vmalloc.c
+
+VME SUBSYSTEM
+M:     Martyn Welch <martyn@welchs.me.uk>
+M:     Manohar Vanga <manohar.vanga@gmail.com>
+M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+L:     linux-kernel@vger.kernel.org
+S:     Odd fixes
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
+F:     Documentation/driver-api/vme.rst
+F:     drivers/staging/vme_user/
+
 VMWARE BALLOON DRIVER
 M:     Nadav Amit <namit@vmware.com>
 R:     VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
@@ -22659,9 +22666,9 @@ F:      drivers/input/tablet/wacom_serial4.c
 WANGXUN ETHERNET DRIVER
 M:     Jiawen Wu <jiawenwu@trustnetic.com>
 M:     Mengyuan Lou <mengyuanlou@net-swift.com>
-W:     https://www.net-swift.com
 L:     netdev@vger.kernel.org
 S:     Maintained
+W:     https://www.net-swift.com
 F:     Documentation/networking/device_drivers/ethernet/wangxun/*
 F:     drivers/net/ethernet/wangxun/
 
@@ -22676,8 +22683,8 @@ F:      Documentation/devicetree/bindings/watchdog/
 F:     Documentation/watchdog/
 F:     drivers/watchdog/
 F:     include/linux/watchdog.h
-F:     include/uapi/linux/watchdog.h
 F:     include/trace/events/watchdog.h
+F:     include/uapi/linux/watchdog.h
 
 WHISKEYCOVE PMIC GPIO DRIVER
 M:     Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
@@ -22834,8 +22841,8 @@ R:      "H. Peter Anvin" <hpa@zytor.com>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
-F:     Documentation/devicetree/bindings/x86/
 F:     Documentation/arch/x86/
+F:     Documentation/devicetree/bindings/x86/
 F:     arch/x86/
 
 X86 ENTRY CODE
@@ -22966,6 +22973,8 @@ M:      John Fastabend <john.fastabend@gmail.com>
 L:     netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
 S:     Supported
+F:     drivers/net/ethernet/*/*/*/*/*xdp*
+F:     drivers/net/ethernet/*/*/*xdp*
 F:     include/net/xdp.h
 F:     include/net/xdp_priv.h
 F:     include/trace/events/xdp.h
@@ -22973,10 +22982,8 @@ F:     kernel/bpf/cpumap.c
 F:     kernel/bpf/devmap.c
 F:     net/core/xdp.c
 F:     samples/bpf/xdp*
-F:     tools/testing/selftests/bpf/*xdp*
 F:     tools/testing/selftests/bpf/*/*xdp*
-F:     drivers/net/ethernet/*/*/*/*/*xdp*
-F:     drivers/net/ethernet/*/*/*xdp*
+F:     tools/testing/selftests/bpf/*xdp*
 K:     (?:\b|_)xdp(?:\b|_)
 
 XDP SOCKETS (AF_XDP)
@@ -22988,11 +22995,11 @@ L:    netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
 S:     Maintained
 F:     Documentation/networking/af_xdp.rst
+F:     include/net/netns/xdp.h
 F:     include/net/xdp_sock*
 F:     include/net/xsk_buff_pool.h
 F:     include/uapi/linux/if_xdp.h
 F:     include/uapi/linux/xdp_diag.h
-F:     include/net/netns/xdp.h
 F:     net/xdp/
 F:     tools/testing/selftests/bpf/*xsk*
 
@@ -23094,11 +23101,11 @@ F:    include/xen/arm/swiotlb-xen.h
 F:     include/xen/swiotlb-xen.h
 
 XFS FILESYSTEM
-C:     irc://irc.oftc.net/xfs
 M:     Darrick J. Wong <djwong@kernel.org>
 L:     linux-xfs@vger.kernel.org
 S:     Supported
 W:     http://xfs.org/
+C:     irc://irc.oftc.net/xfs
 T:     git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 F:     Documentation/ABI/testing/sysfs-fs-xfs
 F:     Documentation/admin-guide/xfs.rst
@@ -23128,16 +23135,28 @@ S:    Maintained
 F:     Documentation/devicetree/bindings/net/can/xilinx,can.yaml
 F:     drivers/net/can/xilinx_can.c
 
+XILINX EVENT MANAGEMENT DRIVER
+M:     Abhyuday Godhasara <abhyuday.godhasara@xilinx.com>
+S:     Maintained
+F:     drivers/soc/xilinx/xlnx_event_manager.c
+F:     include/linux/firmware/xlnx-event-manager.h
+
 XILINX GPIO DRIVER
 M:     Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
 R:     Srinivas Neeli <srinivas.neeli@xilinx.com>
 R:     Michal Simek <michal.simek@amd.com>
 S:     Maintained
-F:     Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml
 F:     Documentation/devicetree/bindings/gpio/gpio-zynq.yaml
+F:     Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml
 F:     drivers/gpio/gpio-xilinx.c
 F:     drivers/gpio/gpio-zynq.c
 
+XILINX PWM DRIVER
+M:     Sean Anderson <sean.anderson@seco.com>
+S:     Maintained
+F:     drivers/pwm/pwm-xilinx.c
+F:     include/clocksource/timer-xilinx.h
+
 XILINX SD-FEC IP CORES
 M:     Derek Kiernan <derek.kiernan@xilinx.com>
 M:     Dragan Cvetic <dragan.cvetic@xilinx.com>
@@ -23149,12 +23168,6 @@ F:     drivers/misc/Makefile
 F:     drivers/misc/xilinx_sdfec.c
 F:     include/uapi/misc/xilinx_sdfec.h
 
-XILINX PWM DRIVER
-M:     Sean Anderson <sean.anderson@seco.com>
-S:     Maintained
-F:     drivers/pwm/pwm-xilinx.c
-F:     include/clocksource/timer-xilinx.h
-
 XILINX UARTLITE SERIAL DRIVER
 M:     Peter Korsgaard <jacmet@sunsite.dk>
 L:     linux-serial@vger.kernel.org
@@ -23220,12 +23233,6 @@ M:     Harsha <harsha.harsha@xilinx.com>
 S:     Maintained
 F:     drivers/crypto/xilinx/zynqmp-sha.c
 
-XILINX EVENT MANAGEMENT DRIVER
-M:     Abhyuday Godhasara <abhyuday.godhasara@xilinx.com>
-S:     Maintained
-F:     drivers/soc/xilinx/xlnx_event_manager.c
-F:     include/linux/firmware/xlnx-event-manager.h
-
 XILLYBUS DRIVER
 M:     Eli Billauer <eli.billauer@gmail.com>
 L:     linux-kernel@vger.kernel.org
@@ -23273,6 +23280,13 @@ S:     Maintained
 F:     Documentation/input/devices/yealink.rst
 F:     drivers/input/misc/yealink.*
 
+Z3FOLD COMPRESSED PAGE ALLOCATOR
+M:     Vitaly Wool <vitaly.wool@konsulko.com>
+R:     Miaohe Lin <linmiaohe@huawei.com>
+L:     linux-mm@kvack.org
+S:     Maintained
+F:     mm/z3fold.c
+
 Z8530 DRIVER FOR AX.25
 M:     Joerg Reuter <jreuter@yaina.de>
 L:     linux-hams@vger.kernel.org
@@ -23290,13 +23304,6 @@ L:     linux-mm@kvack.org
 S:     Maintained
 F:     mm/zbud.c
 
-Z3FOLD COMPRESSED PAGE ALLOCATOR
-M:     Vitaly Wool <vitaly.wool@konsulko.com>
-R:     Miaohe Lin <linmiaohe@huawei.com>
-L:     linux-mm@kvack.org
-S:     Maintained
-F:     mm/z3fold.c
-
 ZD1211RW WIRELESS DRIVER
 M:     Ulrich Kunitz <kune@deine-taler.de>
 L:     linux-wireless@vger.kernel.org
@@ -23383,10 +23390,10 @@ M:    Nick Terrell <terrelln@fb.com>
 S:     Maintained
 B:     https://github.com/facebook/zstd/issues
 T:     git https://github.com/terrelln/linux.git
+F:     crypto/zstd.c
 F:     include/linux/zstd*
-F:     lib/zstd/
 F:     lib/decompress_unzstd.c
-F:     crypto/zstd.c
+F:     lib/zstd/
 N:     zstd
 K:     zstd
 
@@ -23398,13 +23405,6 @@ L:     linux-mm@kvack.org
 S:     Maintained
 F:     mm/zswap.c
 
-NXP BLUETOOTH WIRELESS DRIVERS
-M:     Amitkumar Karwar <amitkumar.karwar@nxp.com>
-M:     Neeraj Kale <neeraj.sanjaykale@nxp.com>
-S:     Maintained
-F:     Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml
-F:     drivers/bluetooth/btnxpuart.c
-
 THE REST
 M:     Linus Torvalds <torvalds@linux-foundation.org>
 L:     linux-kernel@vger.kernel.org
index 9d765eb..f836936 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 6
 PATCHLEVEL = 4
 SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
 NAME = Hurr durr I'ma ninja sloth
 
 # *DOCUMENTATION*
index 53be7ea..9d21921 100644 (file)
@@ -308,6 +308,29 @@ static int unwind_exec_pop_subset_r0_to_r3(struct unwind_ctrl_block *ctrl,
        return URC_OK;
 }
 
+static unsigned long unwind_decode_uleb128(struct unwind_ctrl_block *ctrl)
+{
+       unsigned long bytes = 0;
+       unsigned long insn;
+       unsigned long result = 0;
+
+       /*
+        * unwind_get_byte() will advance `ctrl` one instruction at a time, so
+        * loop until we get an instruction byte where bit 7 is not set.
+        *
+        * Note: This decodes a maximum of 4 bytes to output 28 bits data where
+        * max is 0xfffffff: that will cover a vsp increment of 1073742336, hence
+        * it is sufficient for unwinding the stack.
+        */
+       do {
+               insn = unwind_get_byte(ctrl);
+               result |= (insn & 0x7f) << (bytes * 7);
+               bytes++;
+       } while (!!(insn & 0x80) && (bytes != sizeof(result)));
+
+       return result;
+}
+
 /*
  * Execute the current unwind instruction.
  */
@@ -361,7 +384,7 @@ static int unwind_exec_insn(struct unwind_ctrl_block *ctrl)
                if (ret)
                        goto error;
        } else if (insn == 0xb2) {
-               unsigned long uleb128 = unwind_get_byte(ctrl);
+               unsigned long uleb128 = unwind_decode_uleb128(ctrl);
 
                ctrl->vrs[SP] += 0x204 + (uleb128 << 2);
        } else {
index 67f72ca..1956b09 100644 (file)
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/**
+/*
  *  arch/arm/mac-sa1100/jornada720_ssp.c
  *
  *  Copyright (C) 2006/2007 Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
@@ -26,6 +26,7 @@ static unsigned long jornada_ssp_flags;
 
 /**
  * jornada_ssp_reverse - reverses input byte
+ * @byte: input byte to reverse
  *
  * we need to reverse all data we receive from the mcu due to its physical location
  * returns : 01110111 -> 11101110
@@ -46,6 +47,7 @@ EXPORT_SYMBOL(jornada_ssp_reverse);
 
 /**
  * jornada_ssp_byte - waits for ready ssp bus and sends byte
+ * @byte: input byte to transmit
  *
  * waits for fifo buffer to clear and then transmits, if it doesn't then we will
  * timeout after <timeout> rounds. Needs mcu running before its called.
@@ -77,6 +79,7 @@ EXPORT_SYMBOL(jornada_ssp_byte);
 
 /**
  * jornada_ssp_inout - decide if input is command or trading byte
+ * @byte: input byte to send (may be %TXDUMMY)
  *
  * returns : (jornada_ssp_byte(byte)) on success
  *         : %-ETIMEDOUT on timeout failure
index 7483ef8..62206ef 100644 (file)
@@ -23,6 +23,9 @@
 @
 ENTRY(do_vfp)
        mov     r1, r10
-       mov     r3, r9
-       b       vfp_entry
+       str     lr, [sp, #-8]!
+       add     r3, sp, #4
+       str     r9, [r3]
+       bl      vfp_entry
+       ldr     pc, [sp], #8
 ENDPROC(do_vfp)
index 4d84782..a4610d0 100644 (file)
@@ -172,13 +172,14 @@ vfp_hw_state_valid:
                                        @ out before setting an FPEXC that
                                        @ stops us reading stuff
        VFPFMXR FPEXC, r1               @ Restore FPEXC last
+       mov     sp, r3                  @ we think we have handled things
+       pop     {lr}
        sub     r2, r2, #4              @ Retry current instruction - if Thumb
        str     r2, [sp, #S_PC]         @ mode it's two 16-bit instructions,
                                        @ else it's one 32-bit instruction, so
                                        @ always subtract 4 from the following
                                        @ instruction address.
 
-       mov     lr, r3                  @ we think we have handled things
 local_bh_enable_and_ret:
        adr     r0, .
        mov     r1, #SOFTIRQ_DISABLE_OFFSET
@@ -209,8 +210,9 @@ skip:
 
 process_exception:
        DBGSTR  "bounce"
+       mov     sp, r3                  @ setup for a return to the user code.
+       pop     {lr}
        mov     r2, sp                  @ nothing stacked - regdump is at TOS
-       mov     lr, r3                  @ setup for a return to the user code.
 
        @ Now call the C code to package up the bounce to the support code
        @   r0 holds the trigger instruction
index e2950f5..e715df5 100644 (file)
@@ -413,12 +413,12 @@ extern void paging_init (void);
  *   For the 64bit version, the offset is extended by 32bit.
  */
 #define __swp_type(x)                     ((x).val & 0x1f)
-#define __swp_offset(x)                   ( (((x).val >> 6) &  0x7) | \
-                                         (((x).val >> 8) & ~0x7) )
+#define __swp_offset(x)                   ( (((x).val >> 5) & 0x7) | \
+                                         (((x).val >> 10) << 3) )
 #define __swp_entry(type, offset)         ((swp_entry_t) { \
                                            ((type) & 0x1f) | \
-                                           ((offset &  0x7) << 6) | \
-                                           ((offset & ~0x7) << 8) })
+                                           ((offset & 0x7) << 5) | \
+                                           ((offset >> 3) << 10) })
 #define __pte_to_swp_entry(pte)                ((swp_entry_t) { pte_val(pte) })
 #define __swp_entry_to_pte(x)          ((pte_t) { (x).val })
 
index 5eb7f30..db57345 100644 (file)
@@ -4,6 +4,8 @@
 #include <linux/console.h>
 #include <linux/kexec.h>
 #include <linux/delay.h>
+#include <linux/reboot.h>
+
 #include <asm/cacheflush.h>
 #include <asm/sections.h>
 
index 5d7cb99..7b593d4 100644 (file)
@@ -22,7 +22,7 @@ KCOV_INSTRUMENT       := n
 
 $(obj)/%.pi.o: OBJCOPYFLAGS := --prefix-symbols=__pi_ \
                               --remove-section=.note.gnu.property \
-                              --prefix-alloc-sections=.init
+                              --prefix-alloc-sections=.init.pi
 $(obj)/%.pi.o: $(obj)/%.o FORCE
        $(call if_changed,objcopy)
 
index f03b569..e5f9f46 100644 (file)
@@ -84,11 +84,8 @@ SECTIONS
        __init_data_begin = .;
        INIT_DATA_SECTION(16)
 
-       /* Those sections result from the compilation of kernel/pi/string.c */
-       .init.pidata : {
-               *(.init.srodata.cst8*)
-               *(.init__bug_table*)
-               *(.init.sdata*)
+       .init.pi : {
+               *(.init.pi*)
        }
 
        .init.bss : {
index d096b04..9d24870 100644 (file)
@@ -1703,10 +1703,8 @@ int x86_pmu_handle_irq(struct pt_regs *regs)
 
                perf_sample_data_init(&data, 0, event->hw.last_period);
 
-               if (has_branch_stack(event)) {
-                       data.br_stack = &cpuc->lbr_stack;
-                       data.sample_flags |= PERF_SAMPLE_BRANCH_STACK;
-               }
+               if (has_branch_stack(event))
+                       perf_sample_save_brstack(&data, event, &cpuc->lbr_stack);
 
                if (perf_event_overflow(event, &data, regs))
                        x86_pmu_stop(event, 0);
index a2e566e..df88576 100644 (file)
@@ -1229,12 +1229,14 @@ pebs_update_state(bool needed_cb, struct cpu_hw_events *cpuc,
                  struct perf_event *event, bool add)
 {
        struct pmu *pmu = event->pmu;
+
        /*
         * Make sure we get updated with the first PEBS
         * event. It will trigger also during removal, but
         * that does not hurt:
         */
-       bool update = cpuc->n_pebs == 1;
+       if (cpuc->n_pebs == 1)
+               cpuc->pebs_data_cfg = PEBS_UPDATE_DS_SW;
 
        if (needed_cb != pebs_needs_sched_cb(cpuc)) {
                if (!needed_cb)
@@ -1242,7 +1244,7 @@ pebs_update_state(bool needed_cb, struct cpu_hw_events *cpuc,
                else
                        perf_sched_cb_dec(pmu);
 
-               update = true;
+               cpuc->pebs_data_cfg |= PEBS_UPDATE_DS_SW;
        }
 
        /*
@@ -1252,24 +1254,13 @@ pebs_update_state(bool needed_cb, struct cpu_hw_events *cpuc,
        if (x86_pmu.intel_cap.pebs_baseline && add) {
                u64 pebs_data_cfg;
 
-               /* Clear pebs_data_cfg and pebs_record_size for first PEBS. */
-               if (cpuc->n_pebs == 1) {
-                       cpuc->pebs_data_cfg = 0;
-                       cpuc->pebs_record_size = sizeof(struct pebs_basic);
-               }
-
                pebs_data_cfg = pebs_update_adaptive_cfg(event);
-
-               /* Update pebs_record_size if new event requires more data. */
-               if (pebs_data_cfg & ~cpuc->pebs_data_cfg) {
-                       cpuc->pebs_data_cfg |= pebs_data_cfg;
-                       adaptive_pebs_record_size_update();
-                       update = true;
-               }
+               /*
+                * Be sure to update the thresholds when we change the record.
+                */
+               if (pebs_data_cfg & ~cpuc->pebs_data_cfg)
+                       cpuc->pebs_data_cfg |= pebs_data_cfg | PEBS_UPDATE_DS_SW;
        }
-
-       if (update)
-               pebs_update_threshold(cpuc);
 }
 
 void intel_pmu_pebs_add(struct perf_event *event)
@@ -1326,9 +1317,17 @@ static void intel_pmu_pebs_via_pt_enable(struct perf_event *event)
        wrmsrl(base + idx, value);
 }
 
+static inline void intel_pmu_drain_large_pebs(struct cpu_hw_events *cpuc)
+{
+       if (cpuc->n_pebs == cpuc->n_large_pebs &&
+           cpuc->n_pebs != cpuc->n_pebs_via_pt)
+               intel_pmu_drain_pebs_buffer();
+}
+
 void intel_pmu_pebs_enable(struct perf_event *event)
 {
        struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
+       u64 pebs_data_cfg = cpuc->pebs_data_cfg & ~PEBS_UPDATE_DS_SW;
        struct hw_perf_event *hwc = &event->hw;
        struct debug_store *ds = cpuc->ds;
        unsigned int idx = hwc->idx;
@@ -1344,11 +1343,22 @@ void intel_pmu_pebs_enable(struct perf_event *event)
 
        if (x86_pmu.intel_cap.pebs_baseline) {
                hwc->config |= ICL_EVENTSEL_ADAPTIVE;
-               if (cpuc->pebs_data_cfg != cpuc->active_pebs_data_cfg) {
-                       wrmsrl(MSR_PEBS_DATA_CFG, cpuc->pebs_data_cfg);
-                       cpuc->active_pebs_data_cfg = cpuc->pebs_data_cfg;
+               if (pebs_data_cfg != cpuc->active_pebs_data_cfg) {
+                       /*
+                        * drain_pebs() assumes uniform record size;
+                        * hence we need to drain when changing said
+                        * size.
+                        */
+                       intel_pmu_drain_large_pebs(cpuc);
+                       adaptive_pebs_record_size_update();
+                       wrmsrl(MSR_PEBS_DATA_CFG, pebs_data_cfg);
+                       cpuc->active_pebs_data_cfg = pebs_data_cfg;
                }
        }
+       if (cpuc->pebs_data_cfg & PEBS_UPDATE_DS_SW) {
+               cpuc->pebs_data_cfg = pebs_data_cfg;
+               pebs_update_threshold(cpuc);
+       }
 
        if (idx >= INTEL_PMC_IDX_FIXED) {
                if (x86_pmu.intel_cap.pebs_format < 5)
@@ -1391,9 +1401,7 @@ void intel_pmu_pebs_disable(struct perf_event *event)
        struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
        struct hw_perf_event *hwc = &event->hw;
 
-       if (cpuc->n_pebs == cpuc->n_large_pebs &&
-           cpuc->n_pebs != cpuc->n_pebs_via_pt)
-               intel_pmu_drain_pebs_buffer();
+       intel_pmu_drain_large_pebs(cpuc);
 
        cpuc->pebs_enabled &= ~(1ULL << hwc->idx);
 
index 8fc15ed..abf0988 100644 (file)
 #define PEBS_DATACFG_LBRS      BIT_ULL(3)
 #define PEBS_DATACFG_LBR_SHIFT 24
 
+/* Steal the highest bit of pebs_data_cfg for SW usage */
+#define PEBS_UPDATE_DS_SW      BIT_ULL(63)
+
 /*
  * Intel "Architectural Performance Monitoring" CPUID
  * detection/enumeration details:
index 4266b64..7e331e8 100644 (file)
@@ -36,6 +36,7 @@
 #define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e
 #define PCI_DEVICE_ID_AMD_19H_M60H_DF_F4 0x14e4
 #define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4 0x14f4
+#define PCI_DEVICE_ID_AMD_19H_M78H_DF_F4 0x12fc
 
 /* Protect the PCI config register pairs used for SMN. */
 static DEFINE_MUTEX(smn_mutex);
@@ -79,6 +80,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },
        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) },
        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) },
+       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) },
        {}
 };
 
index 27ef53f..b3b1e37 100644 (file)
@@ -144,8 +144,8 @@ SYM_CODE_END(__x86_indirect_jump_thunk_array)
  */
        .align 64
        .skip 63, 0xcc
-SYM_FUNC_START_NOALIGN(zen_untrain_ret);
-
+SYM_START(zen_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE)
+       ANNOTATE_NOENDBR
        /*
         * As executed from zen_untrain_ret, this is:
         *
index 9c35c95..65ecde3 100644 (file)
@@ -1666,7 +1666,7 @@ static int nbd_dev_dbg_init(struct nbd_device *nbd)
                return -EIO;
 
        dir = debugfs_create_dir(nbd_name(nbd), nbd_dbg_dir);
-       if (!dir) {
+       if (IS_ERR(dir)) {
                dev_err(nbd_to_dev(nbd), "Failed to create debugfs dir for '%s'\n",
                        nbd_name(nbd));
                return -EIO;
@@ -1692,7 +1692,7 @@ static int nbd_dbg_init(void)
        struct dentry *dbg_dir;
 
        dbg_dir = debugfs_create_dir("nbd", NULL);
-       if (!dbg_dir)
+       if (IS_ERR(dbg_dir))
                return -EIO;
 
        nbd_dbg_dir = dbg_dir;
index ea7ac8b..da1d054 100644 (file)
@@ -241,7 +241,7 @@ static inline blk_opf_t rnbd_to_bio_flags(u32 rnbd_opf)
                bio_opf = REQ_OP_WRITE;
                break;
        case RNBD_OP_FLUSH:
-               bio_opf = REQ_OP_FLUSH | REQ_PREFLUSH;
+               bio_opf = REQ_OP_WRITE | REQ_PREFLUSH;
                break;
        case RNBD_OP_DISCARD:
                bio_opf = REQ_OP_DISCARD;
index c7331f5..c7ed5d6 100644 (file)
@@ -1281,7 +1281,7 @@ static inline int ublk_check_cmd_op(u32 cmd_op)
 {
        u32 ioc_type = _IOC_TYPE(cmd_op);
 
-       if (IS_ENABLED(CONFIG_BLKDEV_UBLK_LEGACY_OPCODES) && ioc_type != 'u')
+       if (!IS_ENABLED(CONFIG_BLKDEV_UBLK_LEGACY_OPCODES) && ioc_type != 'u')
                return -EOPNOTSUPP;
 
        if (ioc_type != 'u' && ioc_type != 0)
index bdbd907..f332fe7 100644 (file)
@@ -571,6 +571,7 @@ void read_cdat_data(struct cxl_port *port)
                /* Don't leave table data allocated on error */
                devm_kfree(dev, cdat_table);
                dev_err(dev, "CDAT data read error\n");
+               return;
        }
 
        port->cdat.table = cdat_table + sizeof(__le32);
index af22be8..538bd67 100644 (file)
@@ -706,21 +706,22 @@ static void fwnet_receive_packet(struct fw_card *card, struct fw_request *r,
        int rcode;
 
        if (destination == IEEE1394_ALL_NODES) {
-               kfree(r);
-
-               return;
-       }
-
-       if (offset != dev->handler.offset)
+               // Although the response to the broadcast packet is not necessarily required, the
+               // fw_send_response() function should still be called to maintain the reference
+               // counting of the object. In the case, the call of function just releases the
+               // object as a result to decrease the reference counting.
+               rcode = RCODE_COMPLETE;
+       } else if (offset != dev->handler.offset) {
                rcode = RCODE_ADDRESS_ERROR;
-       else if (tcode != TCODE_WRITE_BLOCK_REQUEST)
+       } else if (tcode != TCODE_WRITE_BLOCK_REQUEST) {
                rcode = RCODE_TYPE_ERROR;
-       else if (fwnet_incoming_packet(dev, payload, length,
-                                      source, generation, false) != 0) {
+       else if (fwnet_incoming_packet(dev, payload, length,
+                                        source, generation, false) != 0) {
                dev_err(&dev->netdev->dev, "incoming packet failure\n");
                rcode = RCODE_CONFLICT_ERROR;
-       } else
+       } else {
                rcode = RCODE_COMPLETE;
+       }
 
        fw_send_response(card, r, rcode);
 }
index ba2f6a4..7b177b9 100644 (file)
@@ -507,6 +507,7 @@ static const struct pci_device_id k10temp_id_table[] = {
        { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },
        { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) },
        { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) },
+       { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) },
        { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },
        {}
 };
index 75c92e2..19a4a08 100644 (file)
@@ -1035,7 +1035,6 @@ static int mdp_comp_sub_create(struct mdp_dev *mdp)
 {
        struct device *dev = &mdp->pdev->dev;
        struct device_node *node, *parent;
-       const struct mtk_mdp_driver_data *data = mdp->mdp_data;
 
        parent = dev->of_node->parent;
 
@@ -1045,7 +1044,7 @@ static int mdp_comp_sub_create(struct mdp_dev *mdp)
                int id, alias_id;
                struct mdp_comp *comp;
 
-               of_id = of_match_node(data->mdp_sub_comp_dt_ids, node);
+               of_id = of_match_node(mdp->mdp_data->mdp_sub_comp_dt_ids, node);
                if (!of_id)
                        continue;
                if (!of_device_is_available(node)) {
index 2385216..253e771 100644 (file)
@@ -378,8 +378,8 @@ static int mxc_isi_runtime_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops mxc_isi_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(mxc_isi_pm_suspend, mxc_isi_pm_resume)
-       SET_RUNTIME_PM_OPS(mxc_isi_runtime_suspend, mxc_isi_runtime_resume, NULL)
+       SYSTEM_SLEEP_PM_OPS(mxc_isi_pm_suspend, mxc_isi_pm_resume)
+       RUNTIME_PM_OPS(mxc_isi_runtime_suspend, mxc_isi_runtime_resume, NULL)
 };
 
 /* -----------------------------------------------------------------------------
@@ -528,7 +528,7 @@ static struct platform_driver mxc_isi_driver = {
        .driver = {
                .of_match_table = mxc_isi_of_match,
                .name           = MXC_ISI_DRIVER_NAME,
-               .pm             = &mxc_isi_pm_ops,
+               .pm             = pm_ptr(&mxc_isi_pm_ops),
        }
 };
 module_platform_driver(mxc_isi_driver);
index db538f3..19e80b9 100644 (file)
@@ -29,11 +29,10 @@ static inline void mxc_isi_write(struct mxc_isi_pipe *pipe, u32 reg, u32 val)
 
 void mxc_isi_channel_set_inbuf(struct mxc_isi_pipe *pipe, dma_addr_t dma_addr)
 {
-       mxc_isi_write(pipe, CHNL_IN_BUF_ADDR, dma_addr);
-#if CONFIG_ARCH_DMA_ADDR_T_64BIT
+       mxc_isi_write(pipe, CHNL_IN_BUF_ADDR, lower_32_bits(dma_addr));
        if (pipe->isi->pdata->has_36bit_dma)
-               mxc_isi_write(pipe, CHNL_IN_BUF_XTND_ADDR, dma_addr >> 32);
-#endif
+               mxc_isi_write(pipe, CHNL_IN_BUF_XTND_ADDR,
+                             upper_32_bits(dma_addr));
 }
 
 void mxc_isi_channel_set_outbuf(struct mxc_isi_pipe *pipe,
@@ -45,34 +44,36 @@ void mxc_isi_channel_set_outbuf(struct mxc_isi_pipe *pipe,
        val = mxc_isi_read(pipe, CHNL_OUT_BUF_CTRL);
 
        if (buf_id == MXC_ISI_BUF1) {
-               mxc_isi_write(pipe, CHNL_OUT_BUF1_ADDR_Y, dma_addrs[0]);
-               mxc_isi_write(pipe, CHNL_OUT_BUF1_ADDR_U, dma_addrs[1]);
-               mxc_isi_write(pipe, CHNL_OUT_BUF1_ADDR_V, dma_addrs[2]);
-#if CONFIG_ARCH_DMA_ADDR_T_64BIT
+               mxc_isi_write(pipe, CHNL_OUT_BUF1_ADDR_Y,
+                             lower_32_bits(dma_addrs[0]));
+               mxc_isi_write(pipe, CHNL_OUT_BUF1_ADDR_U,
+                             lower_32_bits(dma_addrs[1]));
+               mxc_isi_write(pipe, CHNL_OUT_BUF1_ADDR_V,
+                             lower_32_bits(dma_addrs[2]));
                if (pipe->isi->pdata->has_36bit_dma) {
                        mxc_isi_write(pipe, CHNL_Y_BUF1_XTND_ADDR,
-                                     dma_addrs[0] >> 32);
+                                     upper_32_bits(dma_addrs[0]));
                        mxc_isi_write(pipe, CHNL_U_BUF1_XTND_ADDR,
-                                     dma_addrs[1] >> 32);
+                                     upper_32_bits(dma_addrs[1]));
                        mxc_isi_write(pipe, CHNL_V_BUF1_XTND_ADDR,
-                                     dma_addrs[2] >> 32);
+                                     upper_32_bits(dma_addrs[2]));
                }
-#endif
                val ^= CHNL_OUT_BUF_CTRL_LOAD_BUF1_ADDR;
        } else  {
-               mxc_isi_write(pipe, CHNL_OUT_BUF2_ADDR_Y, dma_addrs[0]);
-               mxc_isi_write(pipe, CHNL_OUT_BUF2_ADDR_U, dma_addrs[1]);
-               mxc_isi_write(pipe, CHNL_OUT_BUF2_ADDR_V, dma_addrs[2]);
-#if CONFIG_ARCH_DMA_ADDR_T_64BIT
+               mxc_isi_write(pipe, CHNL_OUT_BUF2_ADDR_Y,
+                             lower_32_bits(dma_addrs[0]));
+               mxc_isi_write(pipe, CHNL_OUT_BUF2_ADDR_U,
+                             lower_32_bits(dma_addrs[1]));
+               mxc_isi_write(pipe, CHNL_OUT_BUF2_ADDR_V,
+                             lower_32_bits(dma_addrs[2]));
                if (pipe->isi->pdata->has_36bit_dma) {
                        mxc_isi_write(pipe, CHNL_Y_BUF2_XTND_ADDR,
-                                     dma_addrs[0] >> 32);
+                                     upper_32_bits(dma_addrs[0]));
                        mxc_isi_write(pipe, CHNL_U_BUF2_XTND_ADDR,
-                                     dma_addrs[1] >> 32);
+                                     upper_32_bits(dma_addrs[1]));
                        mxc_isi_write(pipe, CHNL_V_BUF2_XTND_ADDR,
-                                     dma_addrs[2] >> 32);
+                                     upper_32_bits(dma_addrs[2]));
                }
-#endif
                val ^= CHNL_OUT_BUF_CTRL_LOAD_BUF2_ADDR;
        }
 
index 98bfd44..2a77353 100644 (file)
@@ -728,11 +728,9 @@ static int rvin_setup(struct rvin_dev *vin)
        case V4L2_FIELD_SEQ_TB:
        case V4L2_FIELD_SEQ_BT:
        case V4L2_FIELD_NONE:
-               vnmc = VNMC_IM_ODD_EVEN;
-               progressive = true;
-               break;
        case V4L2_FIELD_ALTERNATE:
                vnmc = VNMC_IM_ODD_EVEN;
+               progressive = true;
                break;
        default:
                vnmc = VNMC_IM_ODD;
@@ -1312,12 +1310,23 @@ static int rvin_mc_validate_format(struct rvin_dev *vin, struct v4l2_subdev *sd,
        }
 
        if (rvin_scaler_needed(vin)) {
+               /* Gen3 can't scale NV12 */
+               if (vin->info->model == RCAR_GEN3 &&
+                   vin->format.pixelformat == V4L2_PIX_FMT_NV12)
+                       return -EPIPE;
+
                if (!vin->scaler)
                        return -EPIPE;
        } else {
-               if (fmt.format.width != vin->format.width ||
-                   fmt.format.height != vin->format.height)
-                       return -EPIPE;
+               if (vin->format.pixelformat == V4L2_PIX_FMT_NV12) {
+                       if (ALIGN(fmt.format.width, 32) != vin->format.width ||
+                           ALIGN(fmt.format.height, 32) != vin->format.height)
+                               return -EPIPE;
+               } else {
+                       if (fmt.format.width != vin->format.width ||
+                           fmt.format.height != vin->format.height)
+                               return -EPIPE;
+               }
        }
 
        if (fmt.format.code != vin->mbus_code)
index c2d080f..27cbe14 100644 (file)
@@ -84,6 +84,11 @@ nla_put_failure:
        return -EMSGSIZE;
 }
 
+/* Limit the max delay range to 300s */
+static struct netlink_range_validation delay_range = {
+       .max = 300000,
+};
+
 static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = {
        [IFLA_BOND_MODE]                = { .type = NLA_U8 },
        [IFLA_BOND_ACTIVE_SLAVE]        = { .type = NLA_U32 },
@@ -114,7 +119,7 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = {
        [IFLA_BOND_AD_ACTOR_SYSTEM]     = { .type = NLA_BINARY,
                                            .len  = ETH_ALEN },
        [IFLA_BOND_TLB_DYNAMIC_LB]      = { .type = NLA_U8 },
-       [IFLA_BOND_PEER_NOTIF_DELAY]    = { .type = NLA_U32 },
+       [IFLA_BOND_PEER_NOTIF_DELAY]    = NLA_POLICY_FULL_RANGE(NLA_U32, &delay_range),
        [IFLA_BOND_MISSED_MAX]          = { .type = NLA_U8 },
        [IFLA_BOND_NS_IP6_TARGET]       = { .type = NLA_NESTED },
 };
index 0498fc6..f3f27f0 100644 (file)
@@ -169,6 +169,12 @@ static const struct bond_opt_value bond_num_peer_notif_tbl[] = {
        { NULL,      -1,  0}
 };
 
+static const struct bond_opt_value bond_peer_notif_delay_tbl[] = {
+       { "off",     0,   0},
+       { "maxval",  300000, BOND_VALFLAG_MAX},
+       { NULL,      -1,  0}
+};
+
 static const struct bond_opt_value bond_primary_reselect_tbl[] = {
        { "always",  BOND_PRI_RESELECT_ALWAYS,  BOND_VALFLAG_DEFAULT},
        { "better",  BOND_PRI_RESELECT_BETTER,  0},
@@ -488,7 +494,7 @@ static const struct bond_option bond_opts[BOND_OPT_LAST] = {
                .id = BOND_OPT_PEER_NOTIF_DELAY,
                .name = "peer_notif_delay",
                .desc = "Delay between each peer notification on failover event, in milliseconds",
-               .values = bond_intmax_tbl,
+               .values = bond_peer_notif_delay_tbl,
                .set = bond_option_peer_notif_delay_set
        }
 };
index 57ce743..caa00c7 100644 (file)
@@ -294,19 +294,6 @@ static int gve_napi_poll_dqo(struct napi_struct *napi, int budget)
        bool reschedule = false;
        int work_done = 0;
 
-       /* Clear PCI MSI-X Pending Bit Array (PBA)
-        *
-        * This bit is set if an interrupt event occurs while the vector is
-        * masked. If this bit is set and we reenable the interrupt, it will
-        * fire again. Since we're just about to poll the queue state, we don't
-        * need it to fire again.
-        *
-        * Under high softirq load, it's possible that the interrupt condition
-        * is triggered twice before we got the chance to process it.
-        */
-       gve_write_irq_doorbell_dqo(priv, block,
-                                  GVE_ITR_NO_UPDATE_DQO | GVE_ITR_CLEAR_PBA_BIT_DQO);
-
        if (block->tx)
                reschedule |= gve_tx_poll_dqo(block, /*do_clean=*/true);
 
index 4c205af..985cff9 100644 (file)
@@ -654,7 +654,7 @@ __mtk_wed_detach(struct mtk_wed_device *dev)
                                           BIT(hw->index), BIT(hw->index));
        }
 
-       if (!hw_list[!hw->index]->wed_dev &&
+       if ((!hw_list[!hw->index] || !hw_list[!hw->index]->wed_dev) &&
            hw->eth->dma_dev != hw->eth->dev)
                mtk_eth_set_dma_device(hw->eth, hw->eth->dev);
 
index ef6fd3f..5595bfe 100644 (file)
@@ -307,15 +307,15 @@ static const u32 vsc7514_sys_regmap[] = {
        REG(SYS_COUNT_DROP_YELLOW_PRIO_4,               0x000218),
        REG(SYS_COUNT_DROP_YELLOW_PRIO_5,               0x00021c),
        REG(SYS_COUNT_DROP_YELLOW_PRIO_6,               0x000220),
-       REG(SYS_COUNT_DROP_YELLOW_PRIO_7,               0x000214),
-       REG(SYS_COUNT_DROP_GREEN_PRIO_0,                0x000218),
-       REG(SYS_COUNT_DROP_GREEN_PRIO_1,                0x00021c),
-       REG(SYS_COUNT_DROP_GREEN_PRIO_2,                0x000220),
-       REG(SYS_COUNT_DROP_GREEN_PRIO_3,                0x000224),
-       REG(SYS_COUNT_DROP_GREEN_PRIO_4,                0x000228),
-       REG(SYS_COUNT_DROP_GREEN_PRIO_5,                0x00022c),
-       REG(SYS_COUNT_DROP_GREEN_PRIO_6,                0x000230),
-       REG(SYS_COUNT_DROP_GREEN_PRIO_7,                0x000234),
+       REG(SYS_COUNT_DROP_YELLOW_PRIO_7,               0x000224),
+       REG(SYS_COUNT_DROP_GREEN_PRIO_0,                0x000228),
+       REG(SYS_COUNT_DROP_GREEN_PRIO_1,                0x00022c),
+       REG(SYS_COUNT_DROP_GREEN_PRIO_2,                0x000230),
+       REG(SYS_COUNT_DROP_GREEN_PRIO_3,                0x000234),
+       REG(SYS_COUNT_DROP_GREEN_PRIO_4,                0x000238),
+       REG(SYS_COUNT_DROP_GREEN_PRIO_5,                0x00023c),
+       REG(SYS_COUNT_DROP_GREEN_PRIO_6,                0x000240),
+       REG(SYS_COUNT_DROP_GREEN_PRIO_7,                0x000244),
        REG(SYS_RESET_CFG,                              0x000508),
        REG(SYS_CMID,                                   0x00050c),
        REG(SYS_VLAN_ETYPE_CFG,                         0x000510),
index 4538f33..d3c5306 100644 (file)
@@ -181,6 +181,7 @@ enum power_event {
 #define GMAC4_LPI_CTRL_STATUS  0xd0
 #define GMAC4_LPI_TIMER_CTRL   0xd4
 #define GMAC4_LPI_ENTRY_TIMER  0xd8
+#define GMAC4_MAC_ONEUS_TIC_COUNTER    0xdc
 
 /* LPI control and status defines */
 #define GMAC4_LPI_CTRL_STATUS_LPITCSE  BIT(21) /* LPI Tx Clock Stop Enable */
index afaec3f..03b1c5a 100644 (file)
@@ -25,6 +25,7 @@ static void dwmac4_core_init(struct mac_device_info *hw,
        struct stmmac_priv *priv = netdev_priv(dev);
        void __iomem *ioaddr = hw->pcsr;
        u32 value = readl(ioaddr + GMAC_CONFIG);
+       u32 clk_rate;
 
        value |= GMAC_CORE_INIT;
 
@@ -47,6 +48,10 @@ static void dwmac4_core_init(struct mac_device_info *hw,
 
        writel(value, ioaddr + GMAC_CONFIG);
 
+       /* Configure LPI 1us counter to number of CSR clock ticks in 1us - 1 */
+       clk_rate = clk_get_rate(priv->plat->stmmac_clk);
+       writel((clk_rate / 1000000) - 1, ioaddr + GMAC4_MAC_ONEUS_TIC_COUNTER);
+
        /* Enable GMAC interrupts */
        value = GMAC_INT_DEFAULT_ENABLE;
 
index 460b3d4..ab5133e 100644 (file)
@@ -436,6 +436,9 @@ static int ipvlan_process_v4_outbound(struct sk_buff *skb)
                goto err;
        }
        skb_dst_set(skb, &rt->dst);
+
+       memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
+
        err = ip_local_out(net, skb->sk, skb);
        if (unlikely(net_xmit_eval(err)))
                dev->stats.tx_errors++;
@@ -474,6 +477,9 @@ static int ipvlan_process_v6_outbound(struct sk_buff *skb)
                goto err;
        }
        skb_dst_set(skb, dst);
+
+       memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));
+
        err = ip6_local_out(net, skb->sk, skb);
        if (unlikely(net_xmit_eval(err)))
                dev->stats.tx_errors++;
index 68fc559..554837c 100644 (file)
@@ -67,6 +67,7 @@ static int mvusb_mdio_probe(struct usb_interface *interface,
        struct device *dev = &interface->dev;
        struct mvusb_mdio *mvusb;
        struct mii_bus *mdio;
+       int ret;
 
        mdio = devm_mdiobus_alloc_size(dev, sizeof(*mvusb));
        if (!mdio)
@@ -87,7 +88,15 @@ static int mvusb_mdio_probe(struct usb_interface *interface,
        mdio->write = mvusb_mdio_write;
 
        usb_set_intfdata(interface, mvusb);
-       return of_mdiobus_register(mdio, dev->of_node);
+       ret = of_mdiobus_register(mdio, dev->of_node);
+       if (ret)
+               goto put_dev;
+
+       return 0;
+
+put_dev:
+       usb_put_dev(mvusb->udev);
+       return ret;
 }
 
 static void mvusb_mdio_disconnect(struct usb_interface *interface)
index 539cd43..f19d48c 100644 (file)
@@ -1203,7 +1203,7 @@ static const struct xpcs_compat synopsys_xpcs_compat[DW_XPCS_INTERFACE_MAX] = {
        [DW_XPCS_2500BASEX] = {
                .supported = xpcs_2500basex_features,
                .interface = xpcs_2500basex_interfaces,
-               .num_interfaces = ARRAY_SIZE(xpcs_2500basex_features),
+               .num_interfaces = ARRAY_SIZE(xpcs_2500basex_interfaces),
                .an_mode = DW_2500BASEX,
        },
 };
index 9902fb1..729db44 100644 (file)
@@ -40,6 +40,11 @@ static inline int bcm_phy_write_exp_sel(struct phy_device *phydev,
        return bcm_phy_write_exp(phydev, reg | MII_BCM54XX_EXP_SEL_ER, val);
 }
 
+static inline int bcm_phy_read_exp_sel(struct phy_device *phydev, u16 reg)
+{
+       return bcm_phy_read_exp(phydev, reg | MII_BCM54XX_EXP_SEL_ER);
+}
+
 int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val);
 int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum);
 
index 06be71e..f8c17a2 100644 (file)
@@ -486,7 +486,7 @@ static int bcm7xxx_16nm_ephy_afe_config(struct phy_device *phydev)
        bcm_phy_write_misc(phydev, 0x0038, 0x0002, 0xede0);
 
        /* Read CORE_EXPA9 */
-       tmp = bcm_phy_read_exp(phydev, 0x00a9);
+       tmp = bcm_phy_read_exp_sel(phydev, 0x00a9);
        /* CORE_EXPA9[6:1] is rcalcode[5:0] */
        rcalcode = (tmp & 0x7e) / 2;
        /* Correct RCAL code + 1 is -1% rprogr, LP: +16 */
index ce993cc..d30d730 100644 (file)
@@ -742,7 +742,7 @@ static ssize_t tap_get_user(struct tap_queue *q, void *msg_control,
 
        /* Move network header to the right position for VLAN tagged packets */
        if (eth_type_vlan(skb->protocol) &&
-           __vlan_get_protocol(skb, skb->protocol, &depth) != 0)
+           vlan_get_protocol_and_depth(skb, skb->protocol, &depth) != 0)
                skb_set_network_header(skb, depth);
 
        /* copy skb_ubuf_info for callback when skb has no error */
@@ -1197,7 +1197,7 @@ static int tap_get_user_xdp(struct tap_queue *q, struct xdp_buff *xdp)
 
        /* Move network header to the right position for VLAN tagged packets */
        if (eth_type_vlan(skb->protocol) &&
-           __vlan_get_protocol(skb, skb->protocol, &depth) != 0)
+           vlan_get_protocol_and_depth(skb, skb->protocol, &depth) != 0)
                skb_set_network_header(skb, depth);
 
        rcu_read_lock();
index 91a077c..a79318e 100644 (file)
@@ -784,7 +784,7 @@ static void mlxbf_tmfifo_rxtx(struct mlxbf_tmfifo_vring *vring, bool is_rx)
        fifo = vring->fifo;
 
        /* Return if vdev is not ready. */
-       if (!fifo->vdev[devid])
+       if (!fifo || !fifo->vdev[devid])
                return;
 
        /* Return if another vring is running. */
@@ -980,9 +980,13 @@ static int mlxbf_tmfifo_virtio_find_vqs(struct virtio_device *vdev,
 
                vq->num_max = vring->num;
 
+               vq->priv = vring;
+
+               /* Make vq update visible before using it. */
+               virtio_mb(false);
+
                vqs[i] = vq;
                vring->vq = vq;
-               vq->priv = vring;
        }
 
        return 0;
@@ -1302,6 +1306,9 @@ static int mlxbf_tmfifo_probe(struct platform_device *pdev)
 
        mod_timer(&fifo->timer, jiffies + MLXBF_TMFIFO_TIMER_INTERVAL);
 
+       /* Make all updates visible before setting the 'is_ready' flag. */
+       virtio_mb(false);
+
        fifo->is_ready = true;
        return 0;
 
index 873f59c..6364ae2 100644 (file)
@@ -211,6 +211,7 @@ struct bios_rfkill2_state {
 static const struct key_entry hp_wmi_keymap[] = {
        { KE_KEY, 0x02,    { KEY_BRIGHTNESSUP } },
        { KE_KEY, 0x03,    { KEY_BRIGHTNESSDOWN } },
+       { KE_KEY, 0x270,   { KEY_MICMUTE } },
        { KE_KEY, 0x20e6,  { KEY_PROG1 } },
        { KE_KEY, 0x20e8,  { KEY_MEDIA } },
        { KE_KEY, 0x2142,  { KEY_MEDIA } },
index 1a300e1..064f186 100644 (file)
@@ -44,14 +44,18 @@ static ssize_t store_min_max_freq_khz(struct uncore_data *data,
                                      int min_max)
 {
        unsigned int input;
+       int ret;
 
        if (kstrtouint(buf, 10, &input))
                return -EINVAL;
 
        mutex_lock(&uncore_lock);
-       uncore_write(data, input, min_max);
+       ret = uncore_write(data, input, min_max);
        mutex_unlock(&uncore_lock);
 
+       if (ret)
+               return ret;
+
        return count;
 }
 
index 80abc70..d904fad 100644 (file)
@@ -34,6 +34,7 @@ static int intel_scu_pci_probe(struct pci_dev *pdev,
 
 static const struct pci_device_id pci_ids[] = {
        { PCI_VDEVICE(INTEL, 0x080e) },
+       { PCI_VDEVICE(INTEL, 0x082a) },
        { PCI_VDEVICE(INTEL, 0x08ea) },
        { PCI_VDEVICE(INTEL, 0x0a94) },
        { PCI_VDEVICE(INTEL, 0x11a0) },
index 6fe82f8..b3808ad 100644 (file)
@@ -10318,6 +10318,7 @@ static atomic_t dytc_ignore_event = ATOMIC_INIT(0);
 static DEFINE_MUTEX(dytc_mutex);
 static int dytc_capabilities;
 static bool dytc_mmc_get_available;
+static int profile_force;
 
 static int convert_dytc_to_profile(int funcmode, int dytcmode,
                enum platform_profile_option *profile)
@@ -10580,6 +10581,21 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)
        if (err)
                return err;
 
+       /* Check if user wants to override the profile selection */
+       if (profile_force) {
+               switch (profile_force) {
+               case -1:
+                       dytc_capabilities = 0;
+                       break;
+               case 1:
+                       dytc_capabilities = BIT(DYTC_FC_MMC);
+                       break;
+               case 2:
+                       dytc_capabilities = BIT(DYTC_FC_PSC);
+                       break;
+               }
+               pr_debug("Profile selection forced: 0x%x\n", dytc_capabilities);
+       }
        if (dytc_capabilities & BIT(DYTC_FC_MMC)) { /* MMC MODE */
                pr_debug("MMC is supported\n");
                /*
@@ -10593,11 +10609,6 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)
                                dytc_mmc_get_available = true;
                }
        } else if (dytc_capabilities & BIT(DYTC_FC_PSC)) { /* PSC MODE */
-               /* Support for this only works on AMD platforms */
-               if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD) {
-                       dbg_printk(TPACPI_DBG_INIT, "PSC not support on Intel platforms\n");
-                       return -ENODEV;
-               }
                pr_debug("PSC is supported\n");
        } else {
                dbg_printk(TPACPI_DBG_INIT, "No DYTC support available\n");
@@ -11646,6 +11657,9 @@ MODULE_PARM_DESC(uwb_state,
                 "Initial state of the emulated UWB switch");
 #endif
 
+module_param(profile_force, int, 0444);
+MODULE_PARM_DESC(profile_force, "Force profile mode. -1=off, 1=MMC, 2=PSC");
+
 static void thinkpad_acpi_module_exit(void)
 {
        struct ibm_struct *ibm, *itmp;
index 13802a3..68e66b6 100644 (file)
@@ -336,6 +336,22 @@ static const struct ts_dmi_data dexp_ursus_7w_data = {
        .properties     = dexp_ursus_7w_props,
 };
 
+static const struct property_entry dexp_ursus_kx210i_props[] = {
+       PROPERTY_ENTRY_U32("touchscreen-min-x", 5),
+       PROPERTY_ENTRY_U32("touchscreen-min-y",  2),
+       PROPERTY_ENTRY_U32("touchscreen-size-x", 1720),
+       PROPERTY_ENTRY_U32("touchscreen-size-y", 1137),
+       PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-dexp-ursus-kx210i.fw"),
+       PROPERTY_ENTRY_U32("silead,max-fingers", 10),
+       PROPERTY_ENTRY_BOOL("silead,home-button"),
+       { }
+};
+
+static const struct ts_dmi_data dexp_ursus_kx210i_data = {
+       .acpi_name      = "MSSL1680:00",
+       .properties     = dexp_ursus_kx210i_props,
+};
+
 static const struct property_entry digma_citi_e200_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 1980),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 1500),
@@ -378,6 +394,11 @@ static const struct ts_dmi_data gdix1001_01_upside_down_data = {
        .properties     = gdix1001_upside_down_props,
 };
 
+static const struct ts_dmi_data gdix1002_00_upside_down_data = {
+       .acpi_name      = "GDIX1002:00",
+       .properties     = gdix1001_upside_down_props,
+};
+
 static const struct property_entry gp_electronic_t701_props[] = {
        PROPERTY_ENTRY_U32("touchscreen-size-x", 960),
        PROPERTY_ENTRY_U32("touchscreen-size-y", 640),
@@ -1186,6 +1207,14 @@ const struct dmi_system_id touchscreen_dmi_table[] = {
                },
        },
        {
+               /* DEXP Ursus KX210i */
+               .driver_data = (void *)&dexp_ursus_kx210i_data,
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "INSYDE Corp."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "S107I"),
+               },
+       },
+       {
                /* Digma Citi E200 */
                .driver_data = (void *)&digma_citi_e200_data,
                .matches = {
@@ -1296,6 +1325,18 @@ const struct dmi_system_id touchscreen_dmi_table[] = {
                },
        },
        {
+               /* Juno Tablet */
+               .driver_data = (void *)&gdix1002_00_upside_down_data,
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Default string"),
+                       /* Both product- and board-name being "Default string" is somewhat rare */
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Default string"),
+                       DMI_MATCH(DMI_BOARD_NAME, "Default string"),
+                       /* Above matches are too generic, add partial bios-version match */
+                       DMI_MATCH(DMI_BIOS_VERSION, "JP2V1."),
+               },
+       },
+       {
                /* Mediacom WinPad 7.0 W700 (same hw as Wintron surftab 7") */
                .driver_data = (void *)&trekstor_surftab_wintron70_data,
                .matches = {
index 17d7bb8..45fd374 100644 (file)
@@ -9459,8 +9459,16 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
                         * that performance might be impacted.
                         */
                        ret = ufshcd_urgent_bkops(hba);
-                       if (ret)
+                       if (ret) {
+                               /*
+                                * If return err in suspend flow, IO will hang.
+                                * Trigger error handler and break suspend for
+                                * error recovery.
+                                */
+                               ufshcd_force_error_recovery(hba);
+                               ret = -EBUSY;
                                goto enable_scaling;
+                       }
                } else {
                        /* make sure that auto bkops is disabled */
                        ufshcd_disable_auto_bkops(hba);
index 3ccf46f..07d6e8d 100644 (file)
@@ -124,7 +124,7 @@ static u_long get_line_length(int xres_virtual, int bpp)
      *  First part, xxxfb_check_var, must not write anything
      *  to hardware, it should only verify and adjust var.
      *  This means it doesn't alter par but it does use hardware
-     *  data from it to check this var. 
+     *  data from it to check this var.
      */
 
 static int mc68x328fb_check_var(struct fb_var_screeninfo *var,
@@ -182,7 +182,7 @@ static int mc68x328fb_check_var(struct fb_var_screeninfo *var,
 
        /*
         * Now that we checked it we alter var. The reason being is that the video
-        * mode passed in might not work but slight changes to it might make it 
+        * mode passed in might not work but slight changes to it might make it
         * work. This way we let the user know what is acceptable.
         */
        switch (var->bits_per_pixel) {
@@ -257,8 +257,8 @@ static int mc68x328fb_check_var(struct fb_var_screeninfo *var,
 }
 
 /* This routine actually sets the video mode. It's in here where we
- * the hardware state info->par and fix which can be affected by the 
- * change in par. For this driver it doesn't do much. 
+ * the hardware state info->par and fix which can be affected by the
+ * change in par. For this driver it doesn't do much.
  */
 static int mc68x328fb_set_par(struct fb_info *info)
 {
@@ -295,7 +295,7 @@ static int mc68x328fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
         *   {hardwarespecific} contains width of RAMDAC
         *   cmap[X] is programmed to (X << red.offset) | (X << green.offset) | (X << blue.offset)
         *   RAMDAC[X] is programmed to (red, green, blue)
-        * 
+        *
         * Pseudocolor:
         *    uses offset = 0 && length = RAMDAC register width.
         *    var->{color}.offset is 0
@@ -384,7 +384,7 @@ static int mc68x328fb_pan_display(struct fb_var_screeninfo *var,
 }
 
     /*
-     *  Most drivers don't need their own mmap function 
+     *  Most drivers don't need their own mmap function
      */
 
 static int mc68x328fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
index 45e6401..024d0ee 100644 (file)
@@ -523,7 +523,7 @@ static int arcfb_probe(struct platform_device *dev)
 
        info = framebuffer_alloc(sizeof(struct arcfb_par), &dev->dev);
        if (!info)
-               goto err;
+               goto err_fb_alloc;
 
        info->screen_base = (char __iomem *)videomemory;
        info->fbops = &arcfb_ops;
@@ -535,7 +535,7 @@ static int arcfb_probe(struct platform_device *dev)
 
        if (!dio_addr || !cio_addr || !c2io_addr) {
                printk(KERN_WARNING "no IO addresses supplied\n");
-               goto err1;
+               goto err_addr;
        }
        par->dio_addr = dio_addr;
        par->cio_addr = cio_addr;
@@ -551,12 +551,12 @@ static int arcfb_probe(struct platform_device *dev)
                        printk(KERN_INFO
                                "arcfb: Failed req IRQ %d\n", par->irq);
                        retval = -EBUSY;
-                       goto err1;
+                       goto err_addr;
                }
        }
        retval = register_framebuffer(info);
        if (retval < 0)
-               goto err1;
+               goto err_register_fb;
        platform_set_drvdata(dev, info);
        fb_info(info, "Arc frame buffer device, using %dK of video memory\n",
                videomemorysize >> 10);
@@ -580,9 +580,12 @@ static int arcfb_probe(struct platform_device *dev)
        }
 
        return 0;
-err1:
+
+err_register_fb:
+       free_irq(par->irq, info);
+err_addr:
        framebuffer_release(info);
-err:
+err_fb_alloc:
        vfree(videomemory);
        return retval;
 }
index 8187a7c..987c5f5 100644 (file)
@@ -317,7 +317,7 @@ static inline void atmel_lcdfb_free_video_memory(struct atmel_lcdfb_info *sinfo)
 /**
  *     atmel_lcdfb_alloc_video_memory - Allocate framebuffer memory
  *     @sinfo: the frame buffer to allocate memory for
- *     
+ *
  *     This function is called only from the atmel_lcdfb_probe()
  *     so no locking by fb_info->mm_lock around smem_len setting is needed.
  */
index a028ede..832a82f 100644 (file)
@@ -512,7 +512,7 @@ static int cg14_probe(struct platform_device *op)
        is_8mb = (resource_size(&op->resource[1]) == (8 * 1024 * 1024));
 
        BUILD_BUG_ON(sizeof(par->mmap_map) != sizeof(__cg14_mmap_map));
-               
+
        memcpy(&par->mmap_map, &__cg14_mmap_map, sizeof(par->mmap_map));
 
        for (i = 0; i < CG14_MMAP_ENTRIES; i++) {
index 77dbf94..82eeb13 100644 (file)
@@ -113,14 +113,14 @@ struct fb_info_control {
        struct fb_info          info;
        struct fb_par_control   par;
        u32                     pseudo_palette[16];
-               
+
        struct cmap_regs        __iomem *cmap_regs;
        unsigned long           cmap_regs_phys;
-       
+
        struct control_regs     __iomem *control_regs;
        unsigned long           control_regs_phys;
        unsigned long           control_regs_size;
-       
+
        __u8                    __iomem *frame_buffer;
        unsigned long           frame_buffer_phys;
        unsigned long           fb_orig_base;
@@ -196,7 +196,7 @@ static void set_control_clock(unsigned char *params)
                while (!req.complete)
                        cuda_poll();
        }
-#endif 
+#endif
 }
 
 /*
@@ -233,19 +233,19 @@ static void control_set_hardware(struct fb_info_control *p, struct fb_par_contro
                if (p->par.xoffset != par->xoffset ||
                    p->par.yoffset != par->yoffset)
                        set_screen_start(par->xoffset, par->yoffset, p);
-                       
+
                return;
        }
-       
+
        p->par = *par;
        cmode = p->par.cmode;
        r = &par->regvals;
-       
+
        /* Turn off display */
        out_le32(CNTRL_REG(p,ctrl), 0x400 | par->ctrl);
-       
+
        set_control_clock(r->clock_params);
-       
+
        RADACAL_WRITE(0x20, r->radacal_ctrl);
        RADACAL_WRITE(0x21, p->control_use_bank2 ? 0 : 1);
        RADACAL_WRITE(0x10, 0);
@@ -254,7 +254,7 @@ static void control_set_hardware(struct fb_info_control *p, struct fb_par_contro
        rp = &p->control_regs->vswin;
        for (i = 0; i < 16; ++i, ++rp)
                out_le32(&rp->r, r->regs[i]);
-       
+
        out_le32(CNTRL_REG(p,pitch), par->pitch);
        out_le32(CNTRL_REG(p,mode), r->mode);
        out_le32(CNTRL_REG(p,vram_attr), p->vram_attr);
@@ -366,7 +366,7 @@ static int read_control_sense(struct fb_info_control *p)
        sense |= (in_le32(CNTRL_REG(p,mon_sense)) & 0x180) >> 7;
 
        out_le32(CNTRL_REG(p,mon_sense), 077);  /* turn off drivers */
-       
+
        return sense;
 }
 
@@ -558,9 +558,9 @@ static int control_var_to_par(struct fb_var_screeninfo *var,
 static void control_par_to_var(struct fb_par_control *par, struct fb_var_screeninfo *var)
 {
        struct control_regints *rv;
-       
+
        rv = (struct control_regints *) par->regvals.regs;
-       
+
        memset(var, 0, sizeof(*var));
        var->xres = par->xres;
        var->yres = par->yres;
@@ -568,7 +568,7 @@ static void control_par_to_var(struct fb_par_control *par, struct fb_var_screeni
        var->yres_virtual = par->vyres;
        var->xoffset = par->xoffset;
        var->yoffset = par->yoffset;
-       
+
        switch(par->cmode) {
        default:
        case CMODE_8:
@@ -634,7 +634,7 @@ static int controlfb_check_var (struct fb_var_screeninfo *var, struct fb_info *i
 
        err = control_var_to_par(var, &par, info);
        if (err)
-               return err;     
+               return err;
        control_par_to_var(&par, var);
 
        return 0;
@@ -655,7 +655,7 @@ static int controlfb_set_par (struct fb_info *info)
                                 " control_var_to_par: %d.\n", err);
                return err;
        }
-       
+
        control_set_hardware(p, &par);
 
        info->fix.visual = (p->par.cmode == CMODE_8) ?
@@ -840,7 +840,7 @@ static int __init init_control(struct fb_info_control *p)
        int full, sense, vmode, cmode, vyres;
        struct fb_var_screeninfo var;
        int rc;
-       
+
        printk(KERN_INFO "controlfb: ");
 
        full = p->total_vram == 0x400000;
index 23cf8eb..f7e019d 100644 (file)
@@ -257,6 +257,11 @@ static const struct fb_videomode modedb[] = {
        { NULL, 72, 480, 300, 33386, 40, 24, 11, 19, 80, 3, 0,
                FB_VMODE_DOUBLE },
 
+       /* 1920x1080 @ 60 Hz, 67.3 kHz hsync */
+       { NULL, 60, 1920, 1080, 6734, 148, 88, 36, 4, 44, 5, 0,
+               FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+               FB_VMODE_NONINTERLACED },
+
        /* 1920x1200 @ 60 Hz, 74.5 Khz hsync */
        { NULL, 60, 1920, 1200, 5177, 128, 336, 1, 38, 208, 3,
                FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
index 05837a3..c5b7673 100644 (file)
@@ -6,7 +6,7 @@
  *
  *  This driver is based on tgafb.c
  *
- *     Copyright (C) 1997 Geert Uytterhoeven 
+ *     Copyright (C) 1997 Geert Uytterhoeven
  *     Copyright (C) 1995  Jay Estabrook
  *
  *  This file is subject to the terms and conditions of the GNU General Public
@@ -28,7 +28,7 @@
 #include <asm/io.h>
 #include <asm/jazz.h>
 
-/* 
+/*
  * Various defines for the G364
  */
 #define G364_MEM_BASE   0xe4400000
@@ -125,7 +125,7 @@ static const struct fb_ops g364fb_ops = {
  *
  *  This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
  */
-static int g364fb_pan_display(struct fb_var_screeninfo *var, 
+static int g364fb_pan_display(struct fb_var_screeninfo *var,
                              struct fb_info *info)
 {
        if (var->xoffset ||
index 20bdab7..0af5801 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * linux/drivers/video/hgafb.c -- Hercules graphics adaptor frame buffer device
- * 
+ *
  *      Created 25 Nov 1999 by Ferenc Bakonyi (fero@drama.obuda.kando.hu)
  *      Based on skeletonfb.c by Geert Uytterhoeven and
  *               mdacon.c by Andrew Apted
@@ -8,14 +8,14 @@
  * History:
  *
  * - Revision 0.1.8 (23 Oct 2002): Ported to new framebuffer api.
- * 
- * - Revision 0.1.7 (23 Jan 2001): fix crash resulting from MDA only cards 
+ *
+ * - Revision 0.1.7 (23 Jan 2001): fix crash resulting from MDA only cards
  *                                being detected as Hercules.   (Paul G.)
  * - Revision 0.1.6 (17 Aug 2000): new style structs
  *                                 documentation
  * - Revision 0.1.5 (13 Mar 2000): spinlocks instead of saveflags();cli();etc
  *                                 minor fixes
- * - Revision 0.1.4 (24 Jan 2000): fixed a bug in hga_card_detect() for 
+ * - Revision 0.1.4 (24 Jan 2000): fixed a bug in hga_card_detect() for
  *                                  HGA-only systems
  * - Revision 0.1.3 (22 Jan 2000): modified for the new fb_info structure
  *                                 screen is cleared after rmmod
@@ -143,7 +143,7 @@ static bool nologo = 0;
 
 static void write_hga_b(unsigned int val, unsigned char reg)
 {
-       outb_p(reg, HGA_INDEX_PORT); 
+       outb_p(reg, HGA_INDEX_PORT);
        outb_p(val, HGA_VALUE_PORT);
 }
 
@@ -155,7 +155,7 @@ static void write_hga_w(unsigned int val, unsigned char reg)
 
 static int test_hga_b(unsigned char val, unsigned char reg)
 {
-       outb_p(reg, HGA_INDEX_PORT); 
+       outb_p(reg, HGA_INDEX_PORT);
        outb  (val, HGA_VALUE_PORT);
        udelay(20); val = (inb_p(HGA_VALUE_PORT) == val);
        return val;
@@ -244,7 +244,7 @@ static void hga_show_logo(struct fb_info *info)
        void __iomem *dest = hga_vram;
        char *logo = linux_logo_bw;
        int x, y;
-       
+
        for (y = 134; y < 134 + 80 ; y++) * this needs some cleanup *
                for (x = 0; x < 10 ; x++)
                        writeb(~*(logo++),(dest + HGA_ROWADDR(y) + x + 40));
@@ -255,7 +255,7 @@ static void hga_pan(unsigned int xoffset, unsigned int yoffset)
 {
        unsigned int base;
        unsigned long flags;
-       
+
        base = (yoffset / 8) * 90 + xoffset;
        spin_lock_irqsave(&hga_reg_lock, flags);
        write_hga_w(base, 0x0c);        /* start address */
@@ -310,7 +310,7 @@ static int hga_card_detect(void)
        /* Ok, there is definitely a card registering at the correct
         * memory location, so now we do an I/O port test.
         */
-       
+
        if (!test_hga_b(0x66, 0x0f))        /* cursor low register */
                goto error;
 
@@ -321,7 +321,7 @@ static int hga_card_detect(void)
         * bit of the status register is changing.  This test lasts for
         * approximately 1/10th of a second.
         */
-       
+
        p_save = q_save = inb_p(HGA_STATUS_PORT) & HGA_STATUS_VSYNC;
 
        for (count=0; count < 50000 && p_save == q_save; count++) {
@@ -329,7 +329,7 @@ static int hga_card_detect(void)
                udelay(2);
        }
 
-       if (p_save == q_save) 
+       if (p_save == q_save)
                goto error;
 
        switch (inb_p(HGA_STATUS_PORT) & 0x70) {
@@ -415,7 +415,7 @@ static int hgafb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
  *     @info:pointer to fb_info object containing info for current hga board
  *
  *     This function looks only at xoffset, yoffset and the %FB_VMODE_YWRAP
- *     flag in @var. If input parameters are correct it calls hga_pan() to 
+ *     flag in @var. If input parameters are correct it calls hga_pan() to
  *     program the hardware. @info->var is updated to the new values.
  *     A zero is returned on success and %-EINVAL for failure.
  */
@@ -442,9 +442,9 @@ static int hgafb_pan_display(struct fb_var_screeninfo *var,
  *     hgafb_blank - (un)blank the screen
  *     @blank_mode:blanking method to use
  *     @info:unused
- *     
- *     Blank the screen if blank_mode != 0, else unblank. 
- *     Implements VESA suspend and powerdown modes on hardware that supports 
+ *
+ *     Blank the screen if blank_mode != 0, else unblank.
+ *     Implements VESA suspend and powerdown modes on hardware that supports
  *     disabling hsync/vsync:
  *             @blank_mode == 2 means suspend vsync,
  *             @blank_mode == 3 means suspend hsync,
@@ -539,15 +539,15 @@ static const struct fb_ops hgafb_ops = {
        .fb_copyarea    = hgafb_copyarea,
        .fb_imageblit   = hgafb_imageblit,
 };
-               
+
 /* ------------------------------------------------------------------------- *
  *
  * Functions in fb_info
- * 
+ *
  * ------------------------------------------------------------------------- */
 
 /* ------------------------------------------------------------------------- */
-    
+
        /*
         *  Initialization
         */
index cdd44e5..77fbff4 100644 (file)
@@ -92,7 +92,7 @@ static int hpfb_setcolreg(unsigned regno, unsigned red, unsigned green,
 
        if (regno >= info->cmap.len)
                return 1;
-       
+
        while (in_be16(fb_regs + 0x6002) & 0x4) udelay(1);
 
        out_be16(fb_regs + 0x60ba, 0xff);
@@ -143,7 +143,7 @@ static void topcat_blit(int x0, int y0, int x1, int y1, int w, int h, int rr)
        out_8(fb_regs + WMOVE, fb_bitmask);
 }
 
-static void hpfb_copyarea(struct fb_info *info, const struct fb_copyarea *area) 
+static void hpfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
 {
        topcat_blit(area->sx, area->sy, area->dx, area->dy, area->width, area->height, RR_COPY);
 }
@@ -315,7 +315,7 @@ unmap_screen_base:
        return ret;
 }
 
-/* 
+/*
  * Check that the secondary ID indicates that we have some hope of working with this
  * framebuffer.  The catseye boards are pretty much like topcats and we can muddle through.
  */
@@ -323,7 +323,7 @@ unmap_screen_base:
 #define topcat_sid_ok(x)  (((x) == DIO_ID2_LRCATSEYE) || ((x) == DIO_ID2_HRCCATSEYE)    \
                           || ((x) == DIO_ID2_HRMCATSEYE) || ((x) == DIO_ID2_TOPCAT))
 
-/* 
+/*
  * Initialise the framebuffer
  */
 static int hpfb_dio_probe(struct dio_dev *d, const struct dio_device_id *ent)
index bea4564..975dd68 100644 (file)
@@ -1347,7 +1347,7 @@ static const struct fb_ops imsttfb_ops = {
        .fb_ioctl       = imsttfb_ioctl,
 };
 
-static void init_imstt(struct fb_info *info)
+static int init_imstt(struct fb_info *info)
 {
        struct imstt_par *par = info->par;
        __u32 i, tmp, *ip, *end;
@@ -1420,7 +1420,7 @@ static void init_imstt(struct fb_info *info)
            || !(compute_imstt_regvals(par, info->var.xres, info->var.yres))) {
                printk("imsttfb: %ux%ux%u not supported\n", info->var.xres, info->var.yres, info->var.bits_per_pixel);
                framebuffer_release(info);
-               return;
+               return -ENODEV;
        }
 
        sprintf(info->fix.id, "IMS TT (%s)", par->ramdac == IBM ? "IBM" : "TVP");
@@ -1456,12 +1456,13 @@ static void init_imstt(struct fb_info *info)
 
        if (register_framebuffer(info) < 0) {
                framebuffer_release(info);
-               return;
+               return -ENODEV;
        }
 
        tmp = (read_reg_le32(par->dc_regs, SSTATUS) & 0x0f00) >> 8;
        fb_info(info, "%s frame buffer; %uMB vram; chip version %u\n",
                info->fix.id, info->fix.smem_len >> 20, tmp);
+       return 0;
 }
 
 static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
@@ -1529,10 +1530,10 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (!par->cmap_regs)
                goto error;
        info->pseudo_palette = par->palette;
-       init_imstt(info);
-
-       pci_set_drvdata(pdev, info);
-       return 0;
+       ret = init_imstt(info);
+       if (!ret)
+               pci_set_drvdata(pdev, info);
+       return ret;
 
 error:
        if (par->dc_regs)
index 312e35c..44ff860 100644 (file)
@@ -339,7 +339,7 @@ static int civic_setpalette(unsigned int regno, unsigned int red,
 {
        unsigned long flags;
        int clut_status;
-       
+
        local_irq_save(flags);
 
        /* Set the register address */
@@ -439,7 +439,7 @@ static int macfb_setcolreg(unsigned regno, unsigned red, unsigned green,
         * (according to the entries in the `var' structure).
         * Return non-zero for invalid regno.
         */
-       
+
        if (regno >= fb_info->cmap.len)
                return 1;
 
@@ -548,7 +548,7 @@ static int __init macfb_init(void)
                return -ENODEV;
        macfb_setup(option);
 
-       if (!MACH_IS_MAC) 
+       if (!MACH_IS_MAC)
                return -ENODEV;
 
        if (mac_bi_data.id == MAC_MODEL_Q630 ||
@@ -644,7 +644,7 @@ static int __init macfb_init(void)
                err = -EINVAL;
                goto fail_unmap;
        }
-       
+
        /*
         * We take a wild guess that if the video physical address is
         * in nubus slot space, that the nubus card is driving video.
@@ -774,7 +774,7 @@ static int __init macfb_init(void)
                        civic_cmap_regs = ioremap(CIVIC_BASE, 0x1000);
                        break;
 
-               
+
                /*
                 * Assorted weirdos
                 * We think this may be like the LC II
index ae1a42b..4e6b052 100644 (file)
@@ -138,7 +138,7 @@ int __init maxinefb_init(void)
                *(volatile unsigned char *)fboff = 0x0;
 
        maxinefb_fix.smem_start = fb_start;
-       
+
        /* erase hardware cursor */
        for (i = 0; i < 512; i++) {
                maxinefb_ims332_write_register(IMS332_REG_CURSOR_RAM + i,
index 3e44f95..0876962 100644 (file)
@@ -65,7 +65,7 @@ static const struct fb_ops p9100_ops = {
 #define P9100_FB_OFF 0x0UL
 
 /* 3 bits: 2=8bpp 3=16bpp 5=32bpp 7=24bpp */
-#define SYS_CONFIG_PIXELSIZE_SHIFT 26 
+#define SYS_CONFIG_PIXELSIZE_SHIFT 26
 
 #define SCREENPAINT_TIMECTL1_ENABLE_VIDEO 0x20 /* 0 = off, 1 = on */
 
@@ -110,7 +110,7 @@ struct p9100_regs {
        u32 vram_xxx[25];
 
        /* Registers for IBM RGB528 Palette */
-       u32 ramdac_cmap_wridx; 
+       u32 ramdac_cmap_wridx;
        u32 ramdac_palette_data;
        u32 ramdac_pixel_mask;
        u32 ramdac_palette_rdaddr;
index 82f019f..f8283fc 100644 (file)
@@ -52,17 +52,17 @@ struct fb_info_platinum {
                __u8 red, green, blue;
        }                               palette[256];
        u32                             pseudo_palette[16];
-       
+
        volatile struct cmap_regs       __iomem *cmap_regs;
        unsigned long                   cmap_regs_phys;
-       
+
        volatile struct platinum_regs   __iomem *platinum_regs;
        unsigned long                   platinum_regs_phys;
-       
+
        __u8                            __iomem *frame_buffer;
        volatile __u8                   __iomem *base_frame_buffer;
        unsigned long                   frame_buffer_phys;
-       
+
        unsigned long                   total_vram;
        int                             clktype;
        int                             dactype;
@@ -133,7 +133,7 @@ static int platinumfb_set_par (struct fb_info *info)
        platinum_set_hardware(pinfo);
 
        init = platinum_reg_init[pinfo->vmode-1];
-       
+
        if ((pinfo->vmode == VMODE_832_624_75) && (pinfo->cmode > CMODE_8))
                offset = 0x10;
 
@@ -214,7 +214,7 @@ static int platinumfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                        break;
                }
        }
-       
+
        return 0;
 }
 
@@ -269,7 +269,7 @@ static void platinum_set_hardware(struct fb_info_platinum *pinfo)
        struct platinum_regvals         *init;
        int                             i;
        int                             vmode, cmode;
-       
+
        vmode = pinfo->vmode;
        cmode = pinfo->cmode;
 
@@ -436,7 +436,7 @@ static int read_platinum_sense(struct fb_info_platinum *info)
  * This routine takes a user-supplied var, and picks the best vmode/cmode from it.
  * It also updates the var structure to the actual mode data obtained
  */
-static int platinum_var_to_par(struct fb_var_screeninfo *var, 
+static int platinum_var_to_par(struct fb_var_screeninfo *var,
                               struct fb_info_platinum *pinfo,
                               int check_only)
 {
@@ -478,12 +478,12 @@ static int platinum_var_to_par(struct fb_var_screeninfo *var,
        pinfo->yoffset = 0;
        pinfo->vxres = pinfo->xres;
        pinfo->vyres = pinfo->yres;
-       
+
        return 0;
 }
 
 
-/* 
+/*
  * Parse user specified options (`video=platinumfb:')
  */
 static int __init platinumfb_setup(char *options)
@@ -624,7 +624,7 @@ static int platinumfb_probe(struct platform_device* odev)
                break;
        }
        dev_set_drvdata(&odev->dev, info);
-       
+
        rc = platinum_init_fb(info);
        if (rc != 0) {
                iounmap(pinfo->frame_buffer);
@@ -640,9 +640,9 @@ static void platinumfb_remove(struct platform_device* odev)
 {
        struct fb_info          *info = dev_get_drvdata(&odev->dev);
        struct fb_info_platinum *pinfo = info->par;
-       
+
         unregister_framebuffer (info);
-       
+
        /* Unmap frame buffer and registers */
        iounmap(pinfo->frame_buffer);
        iounmap(pinfo->platinum_regs);
@@ -656,7 +656,7 @@ static void platinumfb_remove(struct platform_device* odev)
        framebuffer_release(info);
 }
 
-static struct of_device_id platinumfb_match[] = 
+static struct of_device_id platinumfb_match[] =
 {
        {
        .name           = "platinum",
@@ -664,7 +664,7 @@ static struct of_device_id platinumfb_match[] =
        {},
 };
 
-static struct platform_driver platinum_driver = 
+static struct platform_driver platinum_driver =
 {
        .driver = {
                .name = "platinumfb",
index b1b8ccd..a2408bf 100644 (file)
  *     - Driver appears to be working for Brutus 320x200x8bpp mode.  Other
  *       resolutions are working, but only the 8bpp mode is supported.
  *       Changes need to be made to the palette encode and decode routines
- *       to support 4 and 16 bpp modes.  
+ *       to support 4 and 16 bpp modes.
  *       Driver is not designed to be a module.  The FrameBuffer is statically
- *       allocated since dynamic allocation of a 300k buffer cannot be 
- *       guaranteed. 
+ *       allocated since dynamic allocation of a 300k buffer cannot be
+ *       guaranteed.
  *
  * 1999/06/17:
  *     - FrameBuffer memory is now allocated at run-time when the
- *       driver is initialized.    
+ *       driver is initialized.
  *
  * 2000/04/10: Nicolas Pitre <nico@fluxnic.net>
  *     - Big cleanup for dynamic selection of machine type at run time.
@@ -74,8 +74,8 @@
  *
  * 2000/08/07: Tak-Shing Chan <tchan.rd@idthk.com>
  *            Jeff Sutherland <jsutherland@accelent.com>
- *     - Resolved an issue caused by a change made to the Assabet's PLD 
- *       earlier this year which broke the framebuffer driver for newer 
+ *     - Resolved an issue caused by a change made to the Assabet's PLD
+ *       earlier this year which broke the framebuffer driver for newer
  *       Phase 4 Assabets.  Some other parameters were changed to optimize
  *       for the Sharp display.
  *
  * 2000/11/23: Eric Peng <ericpeng@coventive.com>
  *     - Freebird add
  *
- * 2001/02/07: Jamey Hicks <jamey.hicks@compaq.com> 
+ * 2001/02/07: Jamey Hicks <jamey.hicks@compaq.com>
  *            Cliff Brake <cbrake@accelent.com>
  *     - Added PM callback
  *
@@ -500,7 +500,7 @@ sa1100fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
  *     the shortest recovery time
  *  Suspend
  *     This refers to a level of power management in which substantial power
- *     reduction is achieved by the display.  The display can have a longer 
+ *     reduction is achieved by the display.  The display can have a longer
  *     recovery time from this state than from the Stand-by state
  *  Off
  *     This indicates that the display is consuming the lowest level of power
@@ -522,9 +522,9 @@ sa1100fb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
  */
 /*
  * sa1100fb_blank():
- *     Blank the display by setting all palette values to zero.  Note, the 
+ *     Blank the display by setting all palette values to zero.  Note, the
  *     12 and 16 bpp modes don't really use the palette, so this will not
- *      blank the display in all modes.  
+ *      blank the display in all modes.
  */
 static int sa1100fb_blank(int blank, struct fb_info *info)
 {
@@ -603,8 +603,8 @@ static inline unsigned int get_pcd(struct sa1100fb_info *fbi,
 
 /*
  * sa1100fb_activate_var():
- *     Configures LCD Controller based on entries in var parameter.  Settings are      
- *     only written to the controller if changes were made.  
+ *     Configures LCD Controller based on entries in var parameter.  Settings are
+ *     only written to the controller if changes were made.
  */
 static int sa1100fb_activate_var(struct fb_var_screeninfo *var, struct sa1100fb_info *fbi)
 {
@@ -747,7 +747,7 @@ static void sa1100fb_setup_gpio(struct sa1100fb_info *fbi)
         *
         * SA1110 spec update nr. 25 says we can and should
         * clear LDD15 to 12 for 4 or 8bpp modes with active
-        * panels.  
+        * panels.
         */
        if ((fbi->reg_lccr0 & LCCR0_CMS) == LCCR0_Color &&
            (fbi->reg_lccr0 & (LCCR0_Dual|LCCR0_Act)) != 0) {
@@ -1020,9 +1020,9 @@ static int sa1100fb_resume(struct platform_device *dev)
 
 /*
  * sa1100fb_map_video_memory():
- *      Allocates the DRAM memory for the frame buffer.  This buffer is  
- *     remapped into a non-cached, non-buffered, memory region to  
- *      allow palette and pixel writes to occur without flushing the 
+ *      Allocates the DRAM memory for the frame buffer.  This buffer is
+ *     remapped into a non-cached, non-buffered, memory region to
+ *      allow palette and pixel writes to occur without flushing the
  *      cache.  Once this area is remapped, all virtual memory
  *      access to the video memory should occur at the new region.
  */
index ef8a4c5..14c9215 100644 (file)
@@ -1,11 +1,11 @@
 /*
- * linux/drivers/video/stifb.c - 
- * Low level Frame buffer driver for HP workstations with 
+ * linux/drivers/video/stifb.c -
+ * Low level Frame buffer driver for HP workstations with
  * STI (standard text interface) video firmware.
  *
  * Copyright (C) 2001-2006 Helge Deller <deller@gmx.de>
  * Portions Copyright (C) 2001 Thomas Bogendoerfer <tsbogend@alpha.franken.de>
- * 
+ *
  * Based on:
  * - linux/drivers/video/artistfb.c -- Artist frame buffer driver
  *     Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org>
@@ -14,7 +14,7 @@
  * - HP Xhp cfb-based X11 window driver for XFree86
  *     (c)Copyright 1992 Hewlett-Packard Co.
  *
- * 
+ *
  *  The following graphics display devices (NGLE family) are supported by this driver:
  *
  *  HPA4070A   known as "HCRX", a 1280x1024 color device with 8 planes
@@ -30,7 +30,7 @@
  *             supports 1280x1024 color displays with 8 planes.
  *  HP710G     same as HP710C, 1280x1024 grayscale only
  *  HP710L     same as HP710C, 1024x768 color only
- *  HP712      internal graphics support on HP9000s712 SPU, supports 640x480, 
+ *  HP712      internal graphics support on HP9000s712 SPU, supports 640x480,
  *             1024x768 or 1280x1024 color displays on 8 planes (Artist)
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -92,7 +92,7 @@ typedef struct {
        __s32   misc_video_end;
 } video_setup_t;
 
-typedef struct {                  
+typedef struct {
        __s16   sizeof_ngle_data;
        __s16   x_size_visible;     /* visible screen dim in pixels  */
        __s16   y_size_visible;
@@ -177,10 +177,10 @@ static int __initdata stifb_bpp_pref[MAX_STI_ROMS];
 #endif /* DEBUG_STIFB_REGS */
 
 
-#define ENABLE 1       /* for enabling/disabling screen */     
+#define ENABLE 1       /* for enabling/disabling screen */
 #define DISABLE 0
 
-#define NGLE_LOCK(fb_info)     do { } while (0) 
+#define NGLE_LOCK(fb_info)     do { } while (0)
 #define NGLE_UNLOCK(fb_info)   do { } while (0)
 
 static void
@@ -198,9 +198,9 @@ SETUP_HW(struct stifb_info *fb)
 
 static void
 SETUP_FB(struct stifb_info *fb)
-{      
+{
        unsigned int reg10_value = 0;
-       
+
        SETUP_HW(fb);
        switch (fb->id)
        {
@@ -210,15 +210,15 @@ SETUP_FB(struct stifb_info *fb)
                        reg10_value = 0x13601000;
                        break;
                case S9000_ID_A1439A:
-                       if (fb->info.var.bits_per_pixel == 32)                                          
+                       if (fb->info.var.bits_per_pixel == 32)
                                reg10_value = 0xBBA0A000;
-                       else 
+                       else
                                reg10_value = 0x13601000;
                        break;
                case S9000_ID_HCRX:
                        if (fb->info.var.bits_per_pixel == 32)
                                reg10_value = 0xBBA0A000;
-                       else                                    
+                       else
                                reg10_value = 0x13602000;
                        break;
                case S9000_ID_TIMBER:
@@ -243,7 +243,7 @@ START_IMAGE_COLORMAP_ACCESS(struct stifb_info *fb)
 }
 
 static void
-WRITE_IMAGE_COLOR(struct stifb_info *fb, int index, int color) 
+WRITE_IMAGE_COLOR(struct stifb_info *fb, int index, int color)
 {
        SETUP_HW(fb);
        WRITE_WORD(((0x100+index)<<2), fb, REG_3);
@@ -251,30 +251,30 @@ WRITE_IMAGE_COLOR(struct stifb_info *fb, int index, int color)
 }
 
 static void
-FINISH_IMAGE_COLORMAP_ACCESS(struct stifb_info *fb) 
-{              
+FINISH_IMAGE_COLORMAP_ACCESS(struct stifb_info *fb)
+{
        WRITE_WORD(0x400, fb, REG_2);
        if (fb->info.var.bits_per_pixel == 32) {
                WRITE_WORD(0x83000100, fb, REG_1);
        } else {
                if (fb->id == S9000_ID_ARTIST || fb->id == CRT_ID_VISUALIZE_EG)
                        WRITE_WORD(0x80000100, fb, REG_26);
-               else                                                    
+               else
                        WRITE_WORD(0x80000100, fb, REG_1);
        }
        SETUP_FB(fb);
 }
 
 static void
-SETUP_RAMDAC(struct stifb_info *fb) 
+SETUP_RAMDAC(struct stifb_info *fb)
 {
        SETUP_HW(fb);
        WRITE_WORD(0x04000000, fb, 0x1020);
        WRITE_WORD(0xff000000, fb, 0x1028);
 }
 
-static void 
-CRX24_SETUP_RAMDAC(struct stifb_info *fb) 
+static void
+CRX24_SETUP_RAMDAC(struct stifb_info *fb)
 {
        SETUP_HW(fb);
        WRITE_WORD(0x04000000, fb, 0x1000);
@@ -286,14 +286,14 @@ CRX24_SETUP_RAMDAC(struct stifb_info *fb)
 }
 
 #if 0
-static void 
+static void
 HCRX_SETUP_RAMDAC(struct stifb_info *fb)
 {
        WRITE_WORD(0xffffffff, fb, REG_32);
 }
 #endif
 
-static void 
+static void
 CRX24_SET_OVLY_MASK(struct stifb_info *fb)
 {
        SETUP_HW(fb);
@@ -314,7 +314,7 @@ ENABLE_DISABLE_DISPLAY(struct stifb_info *fb, int enable)
         WRITE_WORD(value,      fb, 0x1038);
 }
 
-static void 
+static void
 CRX24_ENABLE_DISABLE_DISPLAY(struct stifb_info *fb, int enable)
 {
        unsigned int value = enable ? 0x10000000 : 0x30000000;
@@ -325,11 +325,11 @@ CRX24_ENABLE_DISABLE_DISPLAY(struct stifb_info *fb, int enable)
 }
 
 static void
-ARTIST_ENABLE_DISABLE_DISPLAY(struct stifb_info *fb, int enable) 
+ARTIST_ENABLE_DISABLE_DISPLAY(struct stifb_info *fb, int enable)
 {
        u32 DregsMiscVideo = REG_21;
        u32 DregsMiscCtl = REG_27;
-       
+
        SETUP_HW(fb);
        if (enable) {
          WRITE_WORD(READ_WORD(fb, DregsMiscVideo) | 0x0A000000, fb, DregsMiscVideo);
@@ -344,7 +344,7 @@ ARTIST_ENABLE_DISABLE_DISPLAY(struct stifb_info *fb, int enable)
        (READ_BYTE(fb, REG_16b3) - 1)
 
 #define HYPER_CONFIG_PLANES_24 0x00000100
-       
+
 #define IS_24_DEVICE(fb) \
        (fb->deviceSpecificConfig & HYPER_CONFIG_PLANES_24)
 
@@ -470,15 +470,15 @@ SETUP_ATTR_ACCESS(struct stifb_info *fb, unsigned BufferNumber)
 }
 
 static void
-SET_ATTR_SIZE(struct stifb_info *fb, int width, int height) 
+SET_ATTR_SIZE(struct stifb_info *fb, int width, int height)
 {
-       /* REG_6 seems to have special values when run on a 
+       /* REG_6 seems to have special values when run on a
           RDI precisionbook parisc laptop (INTERNAL_EG_DX1024 or
           INTERNAL_EG_X1024).  The values are:
                0x2f0: internal (LCD) & external display enabled
                0x2a0: external display only
                0x000: zero on standard artist graphic cards
-       */ 
+       */
        WRITE_WORD(0x00000000, fb, REG_6);
        WRITE_WORD((width<<16) | height, fb, REG_9);
        WRITE_WORD(0x05000000, fb, REG_6);
@@ -486,7 +486,7 @@ SET_ATTR_SIZE(struct stifb_info *fb, int width, int height)
 }
 
 static void
-FINISH_ATTR_ACCESS(struct stifb_info *fb) 
+FINISH_ATTR_ACCESS(struct stifb_info *fb)
 {
        SETUP_HW(fb);
        WRITE_WORD(0x00000000, fb, REG_12);
@@ -499,7 +499,7 @@ elkSetupPlanes(struct stifb_info *fb)
        SETUP_FB(fb);
 }
 
-static void 
+static void
 ngleSetupAttrPlanes(struct stifb_info *fb, int BufferNumber)
 {
        SETUP_ATTR_ACCESS(fb, BufferNumber);
@@ -519,7 +519,7 @@ rattlerSetupPlanes(struct stifb_info *fb)
         * read mask register for overlay planes, not image planes).
         */
        CRX24_SETUP_RAMDAC(fb);
-    
+
        /* change fb->id temporarily to fool SETUP_FB() */
        saved_id = fb->id;
        fb->id = CRX24_OVERLAY_PLANES;
@@ -565,7 +565,7 @@ setNgleLutBltCtl(struct stifb_info *fb, int offsetWithinLut, int length)
        lutBltCtl.all           = 0x80000000;
        lutBltCtl.fields.length = length;
 
-       switch (fb->id) 
+       switch (fb->id)
        {
        case S9000_ID_A1439A:           /* CRX24 */
                if (fb->var.bits_per_pixel == 8) {
@@ -576,12 +576,12 @@ setNgleLutBltCtl(struct stifb_info *fb, int offsetWithinLut, int length)
                        lutBltCtl.fields.lutOffset = 0 * 256;
                }
                break;
-               
+
        case S9000_ID_ARTIST:
                lutBltCtl.fields.lutType = NGLE_CMAP_INDEXED0_TYPE;
                lutBltCtl.fields.lutOffset = 0 * 256;
                break;
-               
+
        default:
                lutBltCtl.fields.lutType = NGLE_CMAP_INDEXED0_TYPE;
                lutBltCtl.fields.lutOffset = 0;
@@ -596,7 +596,7 @@ setNgleLutBltCtl(struct stifb_info *fb, int offsetWithinLut, int length)
 #endif
 
 static NgleLutBltCtl
-setHyperLutBltCtl(struct stifb_info *fb, int offsetWithinLut, int length) 
+setHyperLutBltCtl(struct stifb_info *fb, int offsetWithinLut, int length)
 {
        NgleLutBltCtl lutBltCtl;
 
@@ -633,7 +633,7 @@ static void hyperUndoITE(struct stifb_info *fb)
 
        /* Hardware setup for full-depth write to "magic" location */
        GET_FIFO_SLOTS(fb, nFreeFifoSlots, 7);
-       NGLE_QUICK_SET_DST_BM_ACCESS(fb, 
+       NGLE_QUICK_SET_DST_BM_ACCESS(fb,
                BA(IndexedDcd, Otc04, Ots08, AddrLong,
                BAJustPoint(0), BINovly, BAIndexBase(0)));
        NGLE_QUICK_SET_IMAGE_BITMAP_OP(fb,
@@ -653,13 +653,13 @@ static void hyperUndoITE(struct stifb_info *fb)
        NGLE_UNLOCK(fb);
 }
 
-static void 
+static void
 ngleDepth8_ClearImagePlanes(struct stifb_info *fb)
 {
        /* FIXME! */
 }
 
-static void 
+static void
 ngleDepth24_ClearImagePlanes(struct stifb_info *fb)
 {
        /* FIXME! */
@@ -675,7 +675,7 @@ ngleResetAttrPlanes(struct stifb_info *fb, unsigned int ctlPlaneReg)
        NGLE_LOCK(fb);
 
        GET_FIFO_SLOTS(fb, nFreeFifoSlots, 4);
-       NGLE_QUICK_SET_DST_BM_ACCESS(fb, 
+       NGLE_QUICK_SET_DST_BM_ACCESS(fb,
                                     BA(IndexedDcd, Otc32, OtsIndirect,
                                        AddrLong, BAJustPoint(0),
                                        BINattr, BAIndexBase(0)));
@@ -713,22 +713,22 @@ ngleResetAttrPlanes(struct stifb_info *fb, unsigned int ctlPlaneReg)
        /**** Finally, set the Control Plane Register back to zero: ****/
        GET_FIFO_SLOTS(fb, nFreeFifoSlots, 1);
        NGLE_QUICK_SET_CTL_PLN_REG(fb, 0);
-       
+
        NGLE_UNLOCK(fb);
 }
-    
+
 static void
 ngleClearOverlayPlanes(struct stifb_info *fb, int mask, int data)
 {
        int nFreeFifoSlots = 0;
        u32 packed_dst;
        u32 packed_len;
-    
+
        NGLE_LOCK(fb);
 
        /* Hardware setup */
        GET_FIFO_SLOTS(fb, nFreeFifoSlots, 8);
-       NGLE_QUICK_SET_DST_BM_ACCESS(fb, 
+       NGLE_QUICK_SET_DST_BM_ACCESS(fb,
                                     BA(IndexedDcd, Otc04, Ots08, AddrLong,
                                        BAJustPoint(0), BINovly, BAIndexBase(0)));
 
@@ -736,23 +736,23 @@ ngleClearOverlayPlanes(struct stifb_info *fb, int mask, int data)
 
         NGLE_REALLY_SET_IMAGE_FG_COLOR(fb, data);
         NGLE_REALLY_SET_IMAGE_PLANEMASK(fb, mask);
-    
+
         packed_dst = 0;
         packed_len = (fb->info.var.xres << 16) | fb->info.var.yres;
         NGLE_SET_DSTXY(fb, packed_dst);
-    
-        /* Write zeroes to overlay planes */                  
+
+        /* Write zeroes to overlay planes */
        NGLE_QUICK_SET_IMAGE_BITMAP_OP(fb,
                                       IBOvals(RopSrc, MaskAddrOffset(0),
                                               BitmapExtent08, StaticReg(0),
                                               DataDynamic, MaskOtc, BGx(0), FGx(0)));
-                      
+
         SET_LENXY_START_RECFILL(fb, packed_len);
 
        NGLE_UNLOCK(fb);
 }
 
-static void 
+static void
 hyperResetPlanes(struct stifb_info *fb, int enable)
 {
        unsigned int controlPlaneReg;
@@ -783,7 +783,7 @@ hyperResetPlanes(struct stifb_info *fb, int enable)
                ngleClearOverlayPlanes(fb, 0xff, 255);
 
                /**************************************************
-                ** Also need to counteract ITE settings 
+                ** Also need to counteract ITE settings
                 **************************************************/
                hyperUndoITE(fb);
                break;
@@ -803,13 +803,13 @@ hyperResetPlanes(struct stifb_info *fb, int enable)
                ngleResetAttrPlanes(fb, controlPlaneReg);
                break;
        }
-       
+
        NGLE_UNLOCK(fb);
 }
 
 /* Return pointer to in-memory structure holding ELK device-dependent ROM values. */
 
-static void 
+static void
 ngleGetDeviceRomData(struct stifb_info *fb)
 {
 #if 0
@@ -821,7 +821,7 @@ XXX: FIXME: !!!
        char    *pCard8;
        int     i;
        char    *mapOrigin = NULL;
-    
+
        int romTableIdx;
 
        pPackedDevRomData = fb->ngle_rom;
@@ -888,7 +888,7 @@ SETUP_HCRX(struct stifb_info *fb)
 
        /* Initialize Hyperbowl registers */
        GET_FIFO_SLOTS(fb, nFreeFifoSlots, 7);
-       
+
        if (IS_24_DEVICE(fb)) {
                hyperbowl = (fb->info.var.bits_per_pixel == 32) ?
                        HYPERBOWL_MODE01_8_24_LUT0_TRANSPARENT_LUT1_OPAQUE :
@@ -897,9 +897,9 @@ SETUP_HCRX(struct stifb_info *fb)
                /* First write to Hyperbowl must happen twice (bug) */
                WRITE_WORD(hyperbowl, fb, REG_40);
                WRITE_WORD(hyperbowl, fb, REG_40);
-               
+
                WRITE_WORD(HYPERBOWL_MODE2_8_24, fb, REG_39);
-               
+
                WRITE_WORD(0x014c0148, fb, REG_42); /* Set lut 0 to be the direct color */
                WRITE_WORD(0x404c4048, fb, REG_43);
                WRITE_WORD(0x034c0348, fb, REG_44);
@@ -990,7 +990,7 @@ stifb_setcolreg(u_int regno, u_int red, u_int green,
                                0,      /* Offset w/i LUT */
                                256);   /* Load entire LUT */
                NGLE_BINC_SET_SRCADDR(fb,
-                               NGLE_LONG_FB_ADDRESS(0, 0x100, 0)); 
+                               NGLE_LONG_FB_ADDRESS(0, 0x100, 0));
                                /* 0x100 is same as used in WRITE_IMAGE_COLOR() */
                START_COLORMAPLOAD(fb, lutBltCtl.all);
                SETUP_FB(fb);
@@ -1028,7 +1028,7 @@ stifb_blank(int blank_mode, struct fb_info *info)
                ENABLE_DISABLE_DISPLAY(fb, enable);
                break;
        }
-       
+
        SETUP_FB(fb);
        return 0;
 }
@@ -1114,15 +1114,15 @@ stifb_init_display(struct stifb_info *fb)
 
        /* HCRX specific initialization */
        SETUP_HCRX(fb);
-       
+
        /*
        if (id == S9000_ID_HCRX)
                hyperInitSprite(fb);
        else
                ngleInitSprite(fb);
        */
-       
-       /* Initialize the image planes. */ 
+
+       /* Initialize the image planes. */
         switch (id) {
         case S9000_ID_HCRX:
            hyperResetPlanes(fb, ENABLE);
@@ -1194,7 +1194,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
        fb = kzalloc(sizeof(*fb), GFP_ATOMIC);
        if (!fb)
                return -ENOMEM;
-       
+
        info = &fb->info;
 
        /* set struct to a known state */
@@ -1235,7 +1235,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
                        dev_name, fb->id);
                goto out_err0;
        }
-       
+
        /* default to 8 bpp on most graphic chips */
        bpp = 8;
        xres = sti_onscreen_x(fb->sti);
@@ -1256,7 +1256,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
                fb->id = S9000_ID_A1659A;
                break;
        case S9000_ID_TIMBER:   /* HP9000/710 Any (may be a grayscale device) */
-               if (strstr(dev_name, "GRAYSCALE") || 
+               if (strstr(dev_name, "GRAYSCALE") ||
                    strstr(dev_name, "Grayscale") ||
                    strstr(dev_name, "grayscale"))
                        var->grayscale = 1;
@@ -1295,16 +1295,16 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
        case CRT_ID_VISUALIZE_EG:
        case S9000_ID_ARTIST:   /* Artist */
                break;
-       default: 
+       default:
 #ifdef FALLBACK_TO_1BPP
-               printk(KERN_WARNING 
+               printk(KERN_WARNING
                        "stifb: Unsupported graphics card (id=0x%08x) "
                                "- now trying 1bpp mode instead\n",
                        fb->id);
                bpp = 1;        /* default to 1 bpp */
                break;
 #else
-               printk(KERN_WARNING 
+               printk(KERN_WARNING
                        "stifb: Unsupported graphics card (id=0x%08x) "
                                "- skipping.\n",
                        fb->id);
@@ -1320,11 +1320,11 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
        fix->line_length = (fb->sti->glob_cfg->total_x * bpp) / 8;
        if (!fix->line_length)
                fix->line_length = 2048; /* default */
-       
+
        /* limit fbsize to max visible screen size */
        if (fix->smem_len > yres*fix->line_length)
                fix->smem_len = ALIGN(yres*fix->line_length, 4*1024*1024);
-       
+
        fix->accel = FB_ACCEL_NONE;
 
        switch (bpp) {
@@ -1350,7 +1350,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
            default:
                break;
        }
-       
+
        var->xres = var->xres_virtual = xres;
        var->yres = var->yres_virtual = yres;
        var->bits_per_pixel = bpp;
@@ -1379,7 +1379,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
                                fix->smem_start, fix->smem_start+fix->smem_len);
                goto out_err2;
        }
-               
+
        if (!request_mem_region(fix->mmio_start, fix->mmio_len, "stifb mmio")) {
                printk(KERN_ERR "stifb: cannot reserve sti mmio region 0x%04lx-0x%04lx\n",
                                fix->mmio_start, fix->mmio_start+fix->mmio_len);
@@ -1393,11 +1393,11 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
 
        fb_info(&fb->info, "%s %dx%d-%d frame buffer device, %s, id: %04x, mmio: 0x%04lx\n",
                fix->id,
-               var->xres, 
+               var->xres,
                var->yres,
                var->bits_per_pixel,
                dev_name,
-               fb->id, 
+               fb->id,
                fix->mmio_start);
 
        return 0;
@@ -1413,6 +1413,7 @@ out_err1:
        iounmap(info->screen_base);
 out_err0:
        kfree(fb);
+       sti->info = NULL;
        return -ENXIO;
 }
 
@@ -1426,7 +1427,7 @@ static int __init stifb_init(void)
        struct sti_struct *sti;
        struct sti_struct *def_sti;
        int i;
-       
+
 #ifndef MODULE
        char *option = NULL;
 
@@ -1438,7 +1439,7 @@ static int __init stifb_init(void)
                printk(KERN_INFO "stifb: disabled by \"stifb=off\" kernel parameter\n");
                return -ENXIO;
        }
-       
+
        def_sti = sti_get_rom(0);
        if (def_sti) {
                for (i = 1; i <= MAX_STI_ROMS; i++) {
@@ -1472,7 +1473,7 @@ stifb_cleanup(void)
 {
        struct sti_struct *sti;
        int i;
-       
+
        for (i = 1; i <= MAX_STI_ROMS; i++) {
                sti = sti_get_rom(i);
                if (!sti)
@@ -1495,10 +1496,10 @@ int __init
 stifb_setup(char *options)
 {
        int i;
-       
+
        if (!options || !*options)
                return 1;
-       
+
        if (strncmp(options, "off", 3) == 0) {
                stifb_disabled = 1;
                options += 3;
index 1007023..b166b7c 100644 (file)
@@ -1,7 +1,7 @@
 /*
  *  valkyriefb.c -- frame buffer device for the PowerMac 'valkyrie' display
  *
- *  Created 8 August 1998 by 
+ *  Created 8 August 1998 by
  *  Martin Costabel <costabel@wanadoo.fr> and Kevin Schoedel
  *
  *  Vmode-switching changes and vmode 15/17 modifications created 29 August
@@ -77,13 +77,13 @@ struct fb_info_valkyrie {
        struct fb_par_valkyrie  par;
        struct cmap_regs        __iomem *cmap_regs;
        unsigned long           cmap_regs_phys;
-       
+
        struct valkyrie_regs    __iomem *valkyrie_regs;
        unsigned long           valkyrie_regs_phys;
-       
+
        __u8                    __iomem *frame_buffer;
        unsigned long           frame_buffer_phys;
-       
+
        int                     sense;
        unsigned long           total_vram;
 
@@ -244,7 +244,7 @@ static inline int valkyrie_vram_reqd(int video_mode, int color_mode)
 {
        int pitch;
        struct valkyrie_regvals *init = valkyrie_reg_init[video_mode-1];
-       
+
        if ((pitch = init->pitch[color_mode]) == 0)
                pitch = 2 * init->pitch[0];
        return init->vres * pitch;
@@ -467,7 +467,7 @@ static int valkyrie_var_to_par(struct fb_var_screeninfo *var,
                printk(KERN_ERR "valkyriefb: vmode %d not valid.\n", vmode);
                return -EINVAL;
        }
-       
+
        if (cmode != CMODE_8 && cmode != CMODE_16) {
                printk(KERN_ERR "valkyriefb: cmode %d not valid.\n", cmode);
                return -EINVAL;
@@ -516,7 +516,7 @@ static void valkyrie_init_fix(struct fb_fix_screeninfo *fix, struct fb_info_valk
        fix->ywrapstep = 0;
        fix->ypanstep = 0;
        fix->xpanstep = 0;
-       
+
 }
 
 /* Fix must already be inited above */
index a945739..6f19909 100644 (file)
@@ -111,7 +111,7 @@ static u_long get_line_length(int xres_virtual, int bpp)
      *  First part, xxxfb_check_var, must not write anything
      *  to hardware, it should only verify and adjust var.
      *  This means it doesn't alter par but it does use hardware
-     *  data from it to check this var. 
+     *  data from it to check this var.
      */
 
 static int vfb_check_var(struct fb_var_screeninfo *var,
@@ -169,7 +169,7 @@ static int vfb_check_var(struct fb_var_screeninfo *var,
 
        /*
         * Now that we checked it we alter var. The reason being is that the video
-        * mode passed in might not work but slight changes to it might make it 
+        * mode passed in might not work but slight changes to it might make it
         * work. This way we let the user know what is acceptable.
         */
        switch (var->bits_per_pixel) {
@@ -235,8 +235,8 @@ static int vfb_check_var(struct fb_var_screeninfo *var,
 }
 
 /* This routine actually sets the video mode. It's in here where we
- * the hardware state info->par and fix which can be affected by the 
- * change in par. For this driver it doesn't do much. 
+ * the hardware state info->par and fix which can be affected by the
+ * change in par. For this driver it doesn't do much.
  */
 static int vfb_set_par(struct fb_info *info)
 {
@@ -379,7 +379,7 @@ static int vfb_pan_display(struct fb_var_screeninfo *var,
 }
 
     /*
-     *  Most drivers don't need their own mmap function 
+     *  Most drivers don't need their own mmap function
      */
 
 static int vfb_mmap(struct fb_info *info,
index e54f088..79336fa 100644 (file)
@@ -45,7 +45,8 @@ static int check_extent_in_eb(struct btrfs_backref_walk_ctx *ctx,
        int root_count;
        bool cached;
 
-       if (!btrfs_file_extent_compression(eb, fi) &&
+       if (!ctx->ignore_extent_item_pos &&
+           !btrfs_file_extent_compression(eb, fi) &&
            !btrfs_file_extent_encryption(eb, fi) &&
            !btrfs_file_extent_other_encoding(eb, fi)) {
                u64 data_offset;
@@ -552,7 +553,7 @@ static int add_all_parents(struct btrfs_backref_walk_ctx *ctx,
                                count++;
                        else
                                goto next;
-                       if (!ctx->ignore_extent_item_pos) {
+                       if (!ctx->skip_inode_ref_list) {
                                ret = check_extent_in_eb(ctx, &key, eb, fi, &eie);
                                if (ret == BTRFS_ITERATE_EXTENT_INODES_STOP ||
                                    ret < 0)
@@ -564,7 +565,7 @@ static int add_all_parents(struct btrfs_backref_walk_ctx *ctx,
                                                  eie, (void **)&old, GFP_NOFS);
                        if (ret < 0)
                                break;
-                       if (!ret && !ctx->ignore_extent_item_pos) {
+                       if (!ret && !ctx->skip_inode_ref_list) {
                                while (old->next)
                                        old = old->next;
                                old->next = eie;
@@ -1606,7 +1607,7 @@ again:
                                goto out;
                }
                if (ref->count && ref->parent) {
-                       if (!ctx->ignore_extent_item_pos && !ref->inode_list &&
+                       if (!ctx->skip_inode_ref_list && !ref->inode_list &&
                            ref->level == 0) {
                                struct btrfs_tree_parent_check check = { 0 };
                                struct extent_buffer *eb;
@@ -1647,7 +1648,7 @@ again:
                                                  (void **)&eie, GFP_NOFS);
                        if (ret < 0)
                                goto out;
-                       if (!ret && !ctx->ignore_extent_item_pos) {
+                       if (!ret && !ctx->skip_inode_ref_list) {
                                /*
                                 * We've recorded that parent, so we must extend
                                 * its inode list here.
@@ -1743,7 +1744,7 @@ int btrfs_find_all_leafs(struct btrfs_backref_walk_ctx *ctx)
 static int btrfs_find_all_roots_safe(struct btrfs_backref_walk_ctx *ctx)
 {
        const u64 orig_bytenr = ctx->bytenr;
-       const bool orig_ignore_extent_item_pos = ctx->ignore_extent_item_pos;
+       const bool orig_skip_inode_ref_list = ctx->skip_inode_ref_list;
        bool roots_ulist_allocated = false;
        struct ulist_iterator uiter;
        int ret = 0;
@@ -1764,7 +1765,7 @@ static int btrfs_find_all_roots_safe(struct btrfs_backref_walk_ctx *ctx)
                roots_ulist_allocated = true;
        }
 
-       ctx->ignore_extent_item_pos = true;
+       ctx->skip_inode_ref_list = true;
 
        ULIST_ITER_INIT(&uiter);
        while (1) {
@@ -1789,7 +1790,7 @@ static int btrfs_find_all_roots_safe(struct btrfs_backref_walk_ctx *ctx)
        ulist_free(ctx->refs);
        ctx->refs = NULL;
        ctx->bytenr = orig_bytenr;
-       ctx->ignore_extent_item_pos = orig_ignore_extent_item_pos;
+       ctx->skip_inode_ref_list = orig_skip_inode_ref_list;
 
        return ret;
 }
@@ -1912,7 +1913,7 @@ int btrfs_is_data_extent_shared(struct btrfs_inode *inode, u64 bytenr,
                goto out_trans;
        }
 
-       walk_ctx.ignore_extent_item_pos = true;
+       walk_ctx.skip_inode_ref_list = true;
        walk_ctx.trans = trans;
        walk_ctx.fs_info = fs_info;
        walk_ctx.refs = &ctx->refs;
index ef6bbea..1616e3e 100644 (file)
@@ -60,6 +60,12 @@ struct btrfs_backref_walk_ctx {
         * @extent_item_pos is ignored.
         */
        bool ignore_extent_item_pos;
+       /*
+        * If true and bytenr corresponds to a data extent, then the inode list
+        * (each member describing inode number, file offset and root) is not
+        * added to each reference added to the @refs ulist.
+        */
+       bool skip_inode_ref_list;
        /* A valid transaction handle or NULL. */
        struct btrfs_trans_handle *trans;
        /*
index 3ab707e..ac18c43 100644 (file)
@@ -124,7 +124,8 @@ static u64 block_rsv_release_bytes(struct btrfs_fs_info *fs_info,
        } else {
                num_bytes = 0;
        }
-       if (block_rsv->qgroup_rsv_reserved >= block_rsv->qgroup_rsv_size) {
+       if (qgroup_to_release_ret &&
+           block_rsv->qgroup_rsv_reserved >= block_rsv->qgroup_rsv_size) {
                qgroup_to_release = block_rsv->qgroup_rsv_reserved -
                                    block_rsv->qgroup_rsv_size;
                block_rsv->qgroup_rsv_reserved = block_rsv->qgroup_rsv_size;
index 3c983c7..2ff2961 100644 (file)
@@ -2627,6 +2627,10 @@ static bool check_sibling_keys(struct extent_buffer *left,
        }
 
        if (btrfs_comp_cpu_keys(&left_last, &right_first) >= 0) {
+               btrfs_crit(left->fs_info, "left extent buffer:");
+               btrfs_print_tree(left, false);
+               btrfs_crit(left->fs_info, "right extent buffer:");
+               btrfs_print_tree(right, false);
                btrfs_crit(left->fs_info,
 "bad key order, sibling blocks, left last (%llu %u %llu) right first (%llu %u %llu)",
                           left_last.objectid, left_last.type,
@@ -3215,6 +3219,7 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
 
        if (check_sibling_keys(left, right)) {
                ret = -EUCLEAN;
+               btrfs_abort_transaction(trans, ret);
                btrfs_tree_unlock(right);
                free_extent_buffer(right);
                return ret;
@@ -3433,6 +3438,7 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
 
        if (check_sibling_keys(left, right)) {
                ret = -EUCLEAN;
+               btrfs_abort_transaction(trans, ret);
                goto out;
        }
        return __push_leaf_left(trans, path, min_data_size, empty, left,
@@ -4478,10 +4484,12 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,
 int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path)
 {
        struct btrfs_key key;
+       struct btrfs_key orig_key;
        struct btrfs_disk_key found_key;
        int ret;
 
        btrfs_item_key_to_cpu(path->nodes[0], &key, 0);
+       orig_key = key;
 
        if (key.offset > 0) {
                key.offset--;
@@ -4498,8 +4506,36 @@ int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path)
 
        btrfs_release_path(path);
        ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
-       if (ret < 0)
+       if (ret <= 0)
                return ret;
+
+       /*
+        * Previous key not found. Even if we were at slot 0 of the leaf we had
+        * before releasing the path and calling btrfs_search_slot(), we now may
+        * be in a slot pointing to the same original key - this can happen if
+        * after we released the path, one of more items were moved from a
+        * sibling leaf into the front of the leaf we had due to an insertion
+        * (see push_leaf_right()).
+        * If we hit this case and our slot is > 0 and just decrement the slot
+        * so that the caller does not process the same key again, which may or
+        * may not break the caller, depending on its logic.
+        */
+       if (path->slots[0] < btrfs_header_nritems(path->nodes[0])) {
+               btrfs_item_key(path->nodes[0], &found_key, path->slots[0]);
+               ret = comp_keys(&found_key, &orig_key);
+               if (ret == 0) {
+                       if (path->slots[0] > 0) {
+                               path->slots[0]--;
+                               return 0;
+                       }
+                       /*
+                        * At slot 0, same key as before, it means orig_key is
+                        * the lowest, leftmost, key in the tree. We're done.
+                        */
+                       return 1;
+               }
+       }
+
        btrfs_item_key(path->nodes[0], &found_key, 0);
        ret = comp_keys(&found_key, &key);
        /*
index 59ea049..fbf9006 100644 (file)
@@ -3121,23 +3121,34 @@ int btrfs_start_pre_rw_mount(struct btrfs_fs_info *fs_info)
 {
        int ret;
        const bool cache_opt = btrfs_test_opt(fs_info, SPACE_CACHE);
-       bool clear_free_space_tree = false;
+       bool rebuild_free_space_tree = false;
 
        if (btrfs_test_opt(fs_info, CLEAR_CACHE) &&
            btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE)) {
-               clear_free_space_tree = true;
+               rebuild_free_space_tree = true;
        } else if (btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE) &&
                   !btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE_VALID)) {
                btrfs_warn(fs_info, "free space tree is invalid");
-               clear_free_space_tree = true;
+               rebuild_free_space_tree = true;
        }
 
-       if (clear_free_space_tree) {
-               btrfs_info(fs_info, "clearing free space tree");
-               ret = btrfs_clear_free_space_tree(fs_info);
+       if (rebuild_free_space_tree) {
+               btrfs_info(fs_info, "rebuilding free space tree");
+               ret = btrfs_rebuild_free_space_tree(fs_info);
                if (ret) {
                        btrfs_warn(fs_info,
-                                  "failed to clear free space tree: %d", ret);
+                                  "failed to rebuild free space tree: %d", ret);
+                       goto out;
+               }
+       }
+
+       if (btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE) &&
+           !btrfs_test_opt(fs_info, FREE_SPACE_TREE)) {
+               btrfs_info(fs_info, "disabling free space tree");
+               ret = btrfs_delete_free_space_tree(fs_info);
+               if (ret) {
+                       btrfs_warn(fs_info,
+                                  "failed to disable free space tree: %d", ret);
                        goto out;
                }
        }
index 018c711..cd4cce9 100644 (file)
@@ -52,13 +52,13 @@ void btrfs_inode_safe_disk_i_size_write(struct btrfs_inode *inode, u64 new_i_siz
        u64 start, end, i_size;
        int ret;
 
+       spin_lock(&inode->lock);
        i_size = new_i_size ?: i_size_read(&inode->vfs_inode);
        if (btrfs_fs_incompat(fs_info, NO_HOLES)) {
                inode->disk_i_size = i_size;
-               return;
+               goto out_unlock;
        }
 
-       spin_lock(&inode->lock);
        ret = find_contiguous_extent_bit(&inode->file_extent_tree, 0, &start,
                                         &end, EXTENT_DIRTY);
        if (!ret && start == 0)
@@ -66,6 +66,7 @@ void btrfs_inode_safe_disk_i_size_write(struct btrfs_inode *inode, u64 new_i_siz
        else
                i_size = 0;
        inode->disk_i_size = i_size;
+out_unlock:
        spin_unlock(&inode->lock);
 }
 
index d84cef8..cf98a3c 100644 (file)
@@ -870,15 +870,16 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
                        }
                        spin_lock(&ctl->tree_lock);
                        ret = link_free_space(ctl, e);
-                       ctl->total_bitmaps++;
-                       recalculate_thresholds(ctl);
-                       spin_unlock(&ctl->tree_lock);
                        if (ret) {
+                               spin_unlock(&ctl->tree_lock);
                                btrfs_err(fs_info,
                                        "Duplicate entries in free space cache, dumping");
                                kmem_cache_free(btrfs_free_space_cachep, e);
                                goto free_cache;
                        }
+                       ctl->total_bitmaps++;
+                       recalculate_thresholds(ctl);
+                       spin_unlock(&ctl->tree_lock);
                        list_add_tail(&e->list, &bitmaps);
                }
 
index 4d155a4..b21da14 100644 (file)
@@ -1252,7 +1252,7 @@ out:
        return ret;
 }
 
-int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info)
+int btrfs_delete_free_space_tree(struct btrfs_fs_info *fs_info)
 {
        struct btrfs_trans_handle *trans;
        struct btrfs_root *tree_root = fs_info->tree_root;
@@ -1298,6 +1298,54 @@ abort:
        return ret;
 }
 
+int btrfs_rebuild_free_space_tree(struct btrfs_fs_info *fs_info)
+{
+       struct btrfs_trans_handle *trans;
+       struct btrfs_key key = {
+               .objectid = BTRFS_FREE_SPACE_TREE_OBJECTID,
+               .type = BTRFS_ROOT_ITEM_KEY,
+               .offset = 0,
+       };
+       struct btrfs_root *free_space_root = btrfs_global_root(fs_info, &key);
+       struct rb_node *node;
+       int ret;
+
+       trans = btrfs_start_transaction(free_space_root, 1);
+       if (IS_ERR(trans))
+               return PTR_ERR(trans);
+
+       set_bit(BTRFS_FS_CREATING_FREE_SPACE_TREE, &fs_info->flags);
+       set_bit(BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED, &fs_info->flags);
+
+       ret = clear_free_space_tree(trans, free_space_root);
+       if (ret)
+               goto abort;
+
+       node = rb_first_cached(&fs_info->block_group_cache_tree);
+       while (node) {
+               struct btrfs_block_group *block_group;
+
+               block_group = rb_entry(node, struct btrfs_block_group,
+                                      cache_node);
+               ret = populate_free_space_tree(trans, block_group);
+               if (ret)
+                       goto abort;
+               node = rb_next(node);
+       }
+
+       btrfs_set_fs_compat_ro(fs_info, FREE_SPACE_TREE);
+       btrfs_set_fs_compat_ro(fs_info, FREE_SPACE_TREE_VALID);
+       clear_bit(BTRFS_FS_CREATING_FREE_SPACE_TREE, &fs_info->flags);
+
+       ret = btrfs_commit_transaction(trans);
+       clear_bit(BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED, &fs_info->flags);
+       return ret;
+abort:
+       btrfs_abort_transaction(trans, ret);
+       btrfs_end_transaction(trans);
+       return ret;
+}
+
 static int __add_block_group_free_space(struct btrfs_trans_handle *trans,
                                        struct btrfs_block_group *block_group,
                                        struct btrfs_path *path)
index dc2463e..6d5551d 100644 (file)
@@ -18,7 +18,8 @@ struct btrfs_caching_control;
 
 void set_free_space_tree_thresholds(struct btrfs_block_group *block_group);
 int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info);
-int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info);
+int btrfs_delete_free_space_tree(struct btrfs_fs_info *fs_info);
+int btrfs_rebuild_free_space_tree(struct btrfs_fs_info *fs_info);
 int load_free_space_tree(struct btrfs_caching_control *caching_ctl);
 int add_block_group_free_space(struct btrfs_trans_handle *trans,
                               struct btrfs_block_group *block_group);
index 57d0700..19c707b 100644 (file)
@@ -3108,6 +3108,9 @@ int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
                btrfs_rewrite_logical_zoned(ordered_extent);
                btrfs_zone_finish_endio(fs_info, ordered_extent->disk_bytenr,
                                        ordered_extent->disk_num_bytes);
+       } else if (btrfs_is_data_reloc_root(inode->root)) {
+               btrfs_zone_finish_endio(fs_info, ordered_extent->disk_bytenr,
+                                       ordered_extent->disk_num_bytes);
        }
 
        if (test_bit(BTRFS_ORDERED_TRUNCATED, &ordered_extent->flags)) {
index 25833b4..2fa36f6 100644 (file)
@@ -454,7 +454,9 @@ void btrfs_exclop_balance(struct btrfs_fs_info *fs_info,
        case BTRFS_EXCLOP_BALANCE_PAUSED:
                spin_lock(&fs_info->super_lock);
                ASSERT(fs_info->exclusive_operation == BTRFS_EXCLOP_BALANCE ||
-                      fs_info->exclusive_operation == BTRFS_EXCLOP_DEV_ADD);
+                      fs_info->exclusive_operation == BTRFS_EXCLOP_DEV_ADD ||
+                      fs_info->exclusive_operation == BTRFS_EXCLOP_NONE ||
+                      fs_info->exclusive_operation == BTRFS_EXCLOP_BALANCE_PAUSED);
                fs_info->exclusive_operation = BTRFS_EXCLOP_BALANCE_PAUSED;
                spin_unlock(&fs_info->super_lock);
                break;
index b93c962..497b9db 100644 (file)
@@ -151,10 +151,10 @@ static void print_extent_item(struct extent_buffer *eb, int slot, int type)
                        pr_cont("shared data backref parent %llu count %u\n",
                               offset, btrfs_shared_data_ref_count(eb, sref));
                        /*
-                        * offset is supposed to be a tree block which
-                        * must be aligned to nodesize.
+                        * Offset is supposed to be a tree block which must be
+                        * aligned to sectorsize.
                         */
-                       if (!IS_ALIGNED(offset, eb->fs_info->nodesize))
+                       if (!IS_ALIGNED(offset, eb->fs_info->sectorsize))
                                pr_info(
                        "\t\t\t(parent %llu not aligned to sectorsize %u)\n",
                                     offset, eb->fs_info->sectorsize);
index 09b1988..59a0649 100644 (file)
@@ -3422,7 +3422,7 @@ int add_data_references(struct reloc_control *rc,
        btrfs_release_path(path);
 
        ctx.bytenr = extent_key->objectid;
-       ctx.ignore_extent_item_pos = true;
+       ctx.skip_inode_ref_list = true;
        ctx.fs_info = rc->extent_root->fs_info;
 
        ret = btrfs_find_all_leafs(&ctx);
index 6cb97ef..ec18e22 100644 (file)
@@ -826,7 +826,11 @@ out:
            !btrfs_test_opt(info, CLEAR_CACHE)) {
                btrfs_err(info, "cannot disable free space tree");
                ret = -EINVAL;
-
+       }
+       if (btrfs_fs_compat_ro(info, BLOCK_GROUP_TREE) &&
+            !btrfs_test_opt(info, FREE_SPACE_TREE)) {
+               btrfs_err(info, "cannot disable free space tree with block-group-tree feature");
+               ret = -EINVAL;
        }
        if (!ret)
                ret = btrfs_check_mountopts_zoned(info);
index 03f52e4..841e799 100644 (file)
@@ -395,6 +395,7 @@ void btrfs_free_device(struct btrfs_device *device)
 {
        WARN_ON(!list_empty(&device->post_commit_list));
        rcu_string_free(device->name);
+       extent_io_tree_release(&device->alloc_state);
        btrfs_destroy_dev_zone_info(device);
        kfree(device);
 }
index a9b32ba..39828af 100644 (file)
@@ -122,10 +122,9 @@ static int sb_write_pointer(struct block_device *bdev, struct blk_zone *zones,
                int i;
 
                for (i = 0; i < BTRFS_NR_SB_LOG_ZONES; i++) {
-                       u64 bytenr;
-
-                       bytenr = ((zones[i].start + zones[i].len)
-                                  << SECTOR_SHIFT) - BTRFS_SUPER_INFO_SIZE;
+                       u64 zone_end = (zones[i].start + zones[i].capacity) << SECTOR_SHIFT;
+                       u64 bytenr = ALIGN_DOWN(zone_end, BTRFS_SUPER_INFO_SIZE) -
+                                               BTRFS_SUPER_INFO_SIZE;
 
                        page[i] = read_cache_page_gfp(mapping,
                                        bytenr >> PAGE_SHIFT, GFP_NOFS);
@@ -1168,12 +1167,12 @@ int btrfs_ensure_empty_zones(struct btrfs_device *device, u64 start, u64 size)
                return -ERANGE;
 
        /* All the zones are conventional */
-       if (find_next_bit(zinfo->seq_zones, begin, end) == end)
+       if (find_next_bit(zinfo->seq_zones, end, begin) == end)
                return 0;
 
        /* All the zones are sequential and empty */
-       if (find_next_zero_bit(zinfo->seq_zones, begin, end) == end &&
-           find_next_zero_bit(zinfo->empty_zones, begin, end) == end)
+       if (find_next_zero_bit(zinfo->seq_zones, end, begin) == end &&
+           find_next_zero_bit(zinfo->empty_zones, end, begin) == end)
                return 0;
 
        for (pos = start; pos < start + size; pos += zinfo->zone_size) {
@@ -1610,11 +1609,11 @@ void btrfs_redirty_list_add(struct btrfs_transaction *trans,
            !list_empty(&eb->release_list))
                return;
 
+       memzero_extent_buffer(eb, 0, eb->len);
+       set_bit(EXTENT_BUFFER_NO_CHECK, &eb->bflags);
        set_extent_buffer_dirty(eb);
        set_extent_bits_nowait(&trans->dirty_pages, eb->start,
                               eb->start + eb->len - 1, EXTENT_DIRTY);
-       memzero_extent_buffer(eb, 0, eb->len);
-       set_bit(EXTENT_BUFFER_NO_CHECK, &eb->bflags);
 
        spin_lock(&trans->releasing_ebs_lock);
        list_add_tail(&eb->release_list, &trans->releasing_ebs);
index 32f7c81..43a4d86 100644 (file)
@@ -246,7 +246,7 @@ cifs_read_super(struct super_block *sb)
        if (cifs_sb->ctx->rasize)
                sb->s_bdi->ra_pages = cifs_sb->ctx->rasize / PAGE_SIZE;
        else
-               sb->s_bdi->ra_pages = cifs_sb->ctx->rsize / PAGE_SIZE;
+               sb->s_bdi->ra_pages = 2 * (cifs_sb->ctx->rsize / PAGE_SIZE);
 
        sb->s_blocksize = CIFS_MAX_MSGSIZE;
        sb->s_blocksize_bits = 14;      /* default 2**14 = CIFS_MAX_MSGSIZE */
@@ -744,6 +744,7 @@ static void cifs_umount_begin(struct super_block *sb)
        spin_unlock(&tcon->tc_lock);
        spin_unlock(&cifs_tcp_ses_lock);
 
+       cifs_close_all_deferred_files(tcon);
        /* cancel_brl_requests(tcon); */ /* BB mark all brl mids as exiting */
        /* cancel_notify_requests(tcon); */
        if (tcon->ses && tcon->ses->server) {
@@ -759,6 +760,20 @@ static void cifs_umount_begin(struct super_block *sb)
        return;
 }
 
+static int cifs_freeze(struct super_block *sb)
+{
+       struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
+       struct cifs_tcon *tcon;
+
+       if (cifs_sb == NULL)
+               return 0;
+
+       tcon = cifs_sb_master_tcon(cifs_sb);
+
+       cifs_close_all_deferred_files(tcon);
+       return 0;
+}
+
 #ifdef CONFIG_CIFS_STATS2
 static int cifs_show_stats(struct seq_file *s, struct dentry *root)
 {
@@ -797,6 +812,7 @@ static const struct super_operations cifs_super_ops = {
        as opens */
        .show_options = cifs_show_options,
        .umount_begin   = cifs_umount_begin,
+       .freeze_fs      = cifs_freeze,
 #ifdef CONFIG_CIFS_STATS2
        .show_stats = cifs_show_stats,
 #endif
index eeeed6f..8e9a672 100644 (file)
@@ -2709,6 +2709,13 @@ cifs_match_super(struct super_block *sb, void *data)
 
        spin_lock(&cifs_tcp_ses_lock);
        cifs_sb = CIFS_SB(sb);
+
+       /* We do not want to use a superblock that has been shutdown */
+       if (CIFS_MOUNT_SHUTDOWN & cifs_sb->mnt_cifs_flags) {
+               spin_unlock(&cifs_tcp_ses_lock);
+               return 0;
+       }
+
        tlink = cifs_get_tlink(cifs_sb_master_tlink(cifs_sb));
        if (tlink == NULL) {
                /* can not match superblock if tlink were ever null */
index a817582..a295e4c 100644 (file)
@@ -1682,7 +1682,7 @@ smb2_copychunk_range(const unsigned int xid,
                pcchunk->SourceOffset = cpu_to_le64(src_off);
                pcchunk->TargetOffset = cpu_to_le64(dest_off);
                pcchunk->Length =
-                       cpu_to_le32(min_t(u32, len, tcon->max_bytes_chunk));
+                       cpu_to_le32(min_t(u64, len, tcon->max_bytes_chunk));
 
                /* Request server copy to target from src identified by key */
                kfree(retbuf);
index e33ca0d..9ed61b6 100644 (file)
@@ -1947,6 +1947,9 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree,
        init_copy_chunk_defaults(tcon);
        if (server->ops->validate_negotiate)
                rc = server->ops->validate_negotiate(xid, tcon);
+       if (rc == 0) /* See MS-SMB2 2.2.10 and 3.2.5.5 */
+               if (tcon->share_flags & SMB2_SHAREFLAG_ISOLATED_TRANSPORT)
+                       server->nosharesock = true;
 tcon_exit:
 
        free_rsp_buf(resp_buftype, rsp);
index 0942694..c1edde8 100644 (file)
@@ -305,6 +305,38 @@ struct ext4_group_desc * ext4_get_group_desc(struct super_block *sb,
        return desc;
 }
 
+static ext4_fsblk_t ext4_valid_block_bitmap_padding(struct super_block *sb,
+                                                   ext4_group_t block_group,
+                                                   struct buffer_head *bh)
+{
+       ext4_grpblk_t next_zero_bit;
+       unsigned long bitmap_size = sb->s_blocksize * 8;
+       unsigned int offset = num_clusters_in_group(sb, block_group);
+
+       if (bitmap_size <= offset)
+               return 0;
+
+       next_zero_bit = ext4_find_next_zero_bit(bh->b_data, bitmap_size, offset);
+
+       return (next_zero_bit < bitmap_size ? next_zero_bit : 0);
+}
+
+struct ext4_group_info *ext4_get_group_info(struct super_block *sb,
+                                           ext4_group_t group)
+{
+        struct ext4_group_info **grp_info;
+        long indexv, indexh;
+
+        if (unlikely(group >= EXT4_SB(sb)->s_groups_count)) {
+                ext4_error(sb, "invalid group %u", group);
+                return NULL;
+        }
+        indexv = group >> (EXT4_DESC_PER_BLOCK_BITS(sb));
+        indexh = group & ((EXT4_DESC_PER_BLOCK(sb)) - 1);
+        grp_info = sbi_array_rcu_deref(EXT4_SB(sb), s_group_info, indexv);
+        return grp_info[indexh];
+}
+
 /*
  * Return the block number which was discovered to be invalid, or 0 if
  * the block bitmap is valid.
@@ -379,7 +411,7 @@ static int ext4_validate_block_bitmap(struct super_block *sb,
 
        if (buffer_verified(bh))
                return 0;
-       if (EXT4_MB_GRP_BBITMAP_CORRUPT(grp))
+       if (!grp || EXT4_MB_GRP_BBITMAP_CORRUPT(grp))
                return -EFSCORRUPTED;
 
        ext4_lock_group(sb, block_group);
@@ -402,6 +434,15 @@ static int ext4_validate_block_bitmap(struct super_block *sb,
                                        EXT4_GROUP_INFO_BBITMAP_CORRUPT);
                return -EFSCORRUPTED;
        }
+       blk = ext4_valid_block_bitmap_padding(sb, block_group, bh);
+       if (unlikely(blk != 0)) {
+               ext4_unlock_group(sb, block_group);
+               ext4_error(sb, "bg %u: block %llu: padding at end of block bitmap is not set",
+                          block_group, blk);
+               ext4_mark_group_bitmap_corrupted(sb, block_group,
+                                                EXT4_GROUP_INFO_BBITMAP_CORRUPT);
+               return -EFSCORRUPTED;
+       }
        set_buffer_verified(bh);
 verified:
        ext4_unlock_group(sb, block_group);
index 18cb268..6948d67 100644 (file)
@@ -1684,6 +1684,30 @@ static inline struct ext4_inode_info *EXT4_I(struct inode *inode)
        return container_of(inode, struct ext4_inode_info, vfs_inode);
 }
 
+static inline int ext4_writepages_down_read(struct super_block *sb)
+{
+       percpu_down_read(&EXT4_SB(sb)->s_writepages_rwsem);
+       return memalloc_nofs_save();
+}
+
+static inline void ext4_writepages_up_read(struct super_block *sb, int ctx)
+{
+       memalloc_nofs_restore(ctx);
+       percpu_up_read(&EXT4_SB(sb)->s_writepages_rwsem);
+}
+
+static inline int ext4_writepages_down_write(struct super_block *sb)
+{
+       percpu_down_write(&EXT4_SB(sb)->s_writepages_rwsem);
+       return memalloc_nofs_save();
+}
+
+static inline void ext4_writepages_up_write(struct super_block *sb, int ctx)
+{
+       memalloc_nofs_restore(ctx);
+       percpu_up_write(&EXT4_SB(sb)->s_writepages_rwsem);
+}
+
 static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)
 {
        return ino == EXT4_ROOT_INO ||
@@ -2625,6 +2649,8 @@ extern void ext4_check_blocks_bitmap(struct super_block *);
 extern struct ext4_group_desc * ext4_get_group_desc(struct super_block * sb,
                                                    ext4_group_t block_group,
                                                    struct buffer_head ** bh);
+extern struct ext4_group_info *ext4_get_group_info(struct super_block *sb,
+                                                  ext4_group_t group);
 extern int ext4_should_retry_alloc(struct super_block *sb, int *retries);
 
 extern struct buffer_head *ext4_read_block_bitmap_nowait(struct super_block *sb,
@@ -3232,19 +3258,6 @@ static inline void ext4_isize_set(struct ext4_inode *raw_inode, loff_t i_size)
        raw_inode->i_size_high = cpu_to_le32(i_size >> 32);
 }
 
-static inline
-struct ext4_group_info *ext4_get_group_info(struct super_block *sb,
-                                           ext4_group_t group)
-{
-        struct ext4_group_info **grp_info;
-        long indexv, indexh;
-        BUG_ON(group >= EXT4_SB(sb)->s_groups_count);
-        indexv = group >> (EXT4_DESC_PER_BLOCK_BITS(sb));
-        indexh = group & ((EXT4_DESC_PER_BLOCK(sb)) - 1);
-        grp_info = sbi_array_rcu_deref(EXT4_SB(sb), s_group_info, indexv);
-        return grp_info[indexh];
-}
-
 /*
  * Reading s_groups_count requires using smp_rmb() afterwards.  See
  * the locking protocol documented in the comments of ext4_group_add()
index 7bc2210..595abb9 100644 (file)
@@ -267,14 +267,12 @@ static void __es_find_extent_range(struct inode *inode,
 
        /* see if the extent has been cached */
        es->es_lblk = es->es_len = es->es_pblk = 0;
-       if (tree->cache_es) {
-               es1 = tree->cache_es;
-               if (in_range(lblk, es1->es_lblk, es1->es_len)) {
-                       es_debug("%u cached by [%u/%u) %llu %x\n",
-                                lblk, es1->es_lblk, es1->es_len,
-                                ext4_es_pblock(es1), ext4_es_status(es1));
-                       goto out;
-               }
+       es1 = READ_ONCE(tree->cache_es);
+       if (es1 && in_range(lblk, es1->es_lblk, es1->es_len)) {
+               es_debug("%u cached by [%u/%u) %llu %x\n",
+                        lblk, es1->es_lblk, es1->es_len,
+                        ext4_es_pblock(es1), ext4_es_status(es1));
+               goto out;
        }
 
        es1 = __es_tree_search(&tree->root, lblk);
@@ -293,7 +291,7 @@ out:
        }
 
        if (es1 && matching_fn(es1)) {
-               tree->cache_es = es1;
+               WRITE_ONCE(tree->cache_es, es1);
                es->es_lblk = es1->es_lblk;
                es->es_len = es1->es_len;
                es->es_pblk = es1->es_pblk;
@@ -931,14 +929,12 @@ int ext4_es_lookup_extent(struct inode *inode, ext4_lblk_t lblk,
 
        /* find extent in cache firstly */
        es->es_lblk = es->es_len = es->es_pblk = 0;
-       if (tree->cache_es) {
-               es1 = tree->cache_es;
-               if (in_range(lblk, es1->es_lblk, es1->es_len)) {
-                       es_debug("%u cached by [%u/%u)\n",
-                                lblk, es1->es_lblk, es1->es_len);
-                       found = 1;
-                       goto out;
-               }
+       es1 = READ_ONCE(tree->cache_es);
+       if (es1 && in_range(lblk, es1->es_lblk, es1->es_len)) {
+               es_debug("%u cached by [%u/%u)\n",
+                        lblk, es1->es_lblk, es1->es_len);
+               found = 1;
+               goto out;
        }
 
        node = tree->root.rb_node;
index 147b524..46c3423 100644 (file)
@@ -277,7 +277,11 @@ static int __ext4fs_dirhash(const struct inode *dir, const char *name, int len,
        }
        default:
                hinfo->hash = 0;
-               return -1;
+               hinfo->minor_hash = 0;
+               ext4_warning(dir->i_sb,
+                            "invalid/unsupported hash tree version %u",
+                            hinfo->hash_version);
+               return -EINVAL;
        }
        hash = hash & ~1;
        if (hash == (EXT4_HTREE_EOF_32BIT << 1))
index 787ab89..754f961 100644 (file)
@@ -91,7 +91,7 @@ static int ext4_validate_inode_bitmap(struct super_block *sb,
 
        if (buffer_verified(bh))
                return 0;
-       if (EXT4_MB_GRP_IBITMAP_CORRUPT(grp))
+       if (!grp || EXT4_MB_GRP_IBITMAP_CORRUPT(grp))
                return -EFSCORRUPTED;
 
        ext4_lock_group(sb, block_group);
@@ -293,7 +293,7 @@ void ext4_free_inode(handle_t *handle, struct inode *inode)
        }
        if (!(sbi->s_mount_state & EXT4_FC_REPLAY)) {
                grp = ext4_get_group_info(sb, block_group);
-               if (unlikely(EXT4_MB_GRP_IBITMAP_CORRUPT(grp))) {
+               if (!grp || unlikely(EXT4_MB_GRP_IBITMAP_CORRUPT(grp))) {
                        fatal = -EFSCORRUPTED;
                        goto error_return;
                }
@@ -1046,7 +1046,7 @@ got_group:
                         * Skip groups with already-known suspicious inode
                         * tables
                         */
-                       if (EXT4_MB_GRP_IBITMAP_CORRUPT(grp))
+                       if (!grp || EXT4_MB_GRP_IBITMAP_CORRUPT(grp))
                                goto next_group;
                }
 
@@ -1183,6 +1183,10 @@ got:
 
                if (!(sbi->s_mount_state & EXT4_FC_REPLAY)) {
                        grp = ext4_get_group_info(sb, group);
+                       if (!grp) {
+                               err = -EFSCORRUPTED;
+                               goto out;
+                       }
                        down_read(&grp->alloc_sem); /*
                                                     * protect vs itable
                                                     * lazyinit
@@ -1526,7 +1530,7 @@ int ext4_init_inode_table(struct super_block *sb, ext4_group_t group,
        }
 
        gdp = ext4_get_group_desc(sb, group, &group_desc_bh);
-       if (!gdp)
+       if (!gdp || !grp)
                goto out;
 
        /*
index 859bc4e..5854bd5 100644 (file)
@@ -34,6 +34,7 @@ static int get_max_inline_xattr_value_size(struct inode *inode,
        struct ext4_xattr_ibody_header *header;
        struct ext4_xattr_entry *entry;
        struct ext4_inode *raw_inode;
+       void *end;
        int free, min_offs;
 
        if (!EXT4_INODE_HAS_XATTR_SPACE(inode))
@@ -57,14 +58,23 @@ static int get_max_inline_xattr_value_size(struct inode *inode,
        raw_inode = ext4_raw_inode(iloc);
        header = IHDR(inode, raw_inode);
        entry = IFIRST(header);
+       end = (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size;
 
        /* Compute min_offs. */
-       for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
+       while (!IS_LAST_ENTRY(entry)) {
+               void *next = EXT4_XATTR_NEXT(entry);
+
+               if (next >= end) {
+                       EXT4_ERROR_INODE(inode,
+                                        "corrupt xattr in inline inode");
+                       return 0;
+               }
                if (!entry->e_value_inum && entry->e_value_size) {
                        size_t offs = le16_to_cpu(entry->e_value_offs);
                        if (offs < min_offs)
                                min_offs = offs;
                }
+               entry = next;
        }
        free = min_offs -
                ((void *)entry - (void *)IFIRST(header)) - sizeof(__u32);
@@ -350,7 +360,7 @@ static int ext4_update_inline_data(handle_t *handle, struct inode *inode,
 
        error = ext4_xattr_ibody_get(inode, i.name_index, i.name,
                                     value, len);
-       if (error == -ENODATA)
+       if (error < 0)
                goto out;
 
        BUFFER_TRACE(is.iloc.bh, "get_write_access");
@@ -1175,6 +1185,7 @@ static int ext4_finish_convert_inline_dir(handle_t *handle,
                ext4_initialize_dirent_tail(dir_block,
                                            inode->i_sb->s_blocksize);
        set_buffer_uptodate(dir_block);
+       unlock_buffer(dir_block);
        err = ext4_handle_dirty_dirblock(handle, inode, dir_block);
        if (err)
                return err;
@@ -1249,6 +1260,7 @@ static int ext4_convert_inline_data_nolock(handle_t *handle,
        if (!S_ISDIR(inode->i_mode)) {
                memcpy(data_bh->b_data, buf, inline_size);
                set_buffer_uptodate(data_bh);
+               unlock_buffer(data_bh);
                error = ext4_handle_dirty_metadata(handle,
                                                   inode, data_bh);
        } else {
@@ -1256,7 +1268,6 @@ static int ext4_convert_inline_data_nolock(handle_t *handle,
                                                       buf, inline_size);
        }
 
-       unlock_buffer(data_bh);
 out_restore:
        if (error)
                ext4_restore_inline_data(handle, inode, iloc, buf, inline_size);
index 0d5ba92..ce5f21b 100644 (file)
@@ -2783,11 +2783,12 @@ static int ext4_writepages(struct address_space *mapping,
                .can_map = 1,
        };
        int ret;
+       int alloc_ctx;
 
        if (unlikely(ext4_forced_shutdown(EXT4_SB(sb))))
                return -EIO;
 
-       percpu_down_read(&EXT4_SB(sb)->s_writepages_rwsem);
+       alloc_ctx = ext4_writepages_down_read(sb);
        ret = ext4_do_writepages(&mpd);
        /*
         * For data=journal writeback we could have come across pages marked
@@ -2796,7 +2797,7 @@ static int ext4_writepages(struct address_space *mapping,
         */
        if (!ret && mpd.journalled_more_data)
                ret = ext4_do_writepages(&mpd);
-       percpu_up_read(&EXT4_SB(sb)->s_writepages_rwsem);
+       ext4_writepages_up_read(sb, alloc_ctx);
 
        return ret;
 }
@@ -2824,17 +2825,18 @@ static int ext4_dax_writepages(struct address_space *mapping,
        long nr_to_write = wbc->nr_to_write;
        struct inode *inode = mapping->host;
        struct ext4_sb_info *sbi = EXT4_SB(mapping->host->i_sb);
+       int alloc_ctx;
 
        if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))
                return -EIO;
 
-       percpu_down_read(&sbi->s_writepages_rwsem);
+       alloc_ctx = ext4_writepages_down_read(inode->i_sb);
        trace_ext4_writepages(inode, wbc);
 
        ret = dax_writeback_mapping_range(mapping, sbi->s_daxdev, wbc);
        trace_ext4_writepages_result(inode, wbc, ret,
                                     nr_to_write - wbc->nr_to_write);
-       percpu_up_read(&sbi->s_writepages_rwsem);
+       ext4_writepages_up_read(inode->i_sb, alloc_ctx);
        return ret;
 }
 
@@ -3375,7 +3377,7 @@ static int ext4_iomap_overwrite_begin(struct inode *inode, loff_t offset,
         */
        flags &= ~IOMAP_WRITE;
        ret = ext4_iomap_begin(inode, offset, length, flags, iomap, srcmap);
-       WARN_ON_ONCE(iomap->type != IOMAP_MAPPED);
+       WARN_ON_ONCE(!ret && iomap->type != IOMAP_MAPPED);
        return ret;
 }
 
@@ -5928,7 +5930,7 @@ int ext4_change_inode_journal_flag(struct inode *inode, int val)
        journal_t *journal;
        handle_t *handle;
        int err;
-       struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
+       int alloc_ctx;
 
        /*
         * We have to be very careful here: changing a data block's
@@ -5966,7 +5968,7 @@ int ext4_change_inode_journal_flag(struct inode *inode, int val)
                }
        }
 
-       percpu_down_write(&sbi->s_writepages_rwsem);
+       alloc_ctx = ext4_writepages_down_write(inode->i_sb);
        jbd2_journal_lock_updates(journal);
 
        /*
@@ -5983,7 +5985,7 @@ int ext4_change_inode_journal_flag(struct inode *inode, int val)
                err = jbd2_journal_flush(journal, 0);
                if (err < 0) {
                        jbd2_journal_unlock_updates(journal);
-                       percpu_up_write(&sbi->s_writepages_rwsem);
+                       ext4_writepages_up_write(inode->i_sb, alloc_ctx);
                        return err;
                }
                ext4_clear_inode_flag(inode, EXT4_INODE_JOURNAL_DATA);
@@ -5991,7 +5993,7 @@ int ext4_change_inode_journal_flag(struct inode *inode, int val)
        ext4_set_aops(inode);
 
        jbd2_journal_unlock_updates(journal);
-       percpu_up_write(&sbi->s_writepages_rwsem);
+       ext4_writepages_up_write(inode->i_sb, alloc_ctx);
 
        if (val)
                filemap_invalidate_unlock(inode->i_mapping);
index 78259bd..7b2e36d 100644 (file)
@@ -745,6 +745,8 @@ static int __mb_check_buddy(struct ext4_buddy *e4b, char *file,
        MB_CHECK_ASSERT(e4b->bd_info->bb_fragments == fragments);
 
        grp = ext4_get_group_info(sb, e4b->bd_group);
+       if (!grp)
+               return NULL;
        list_for_each(cur, &grp->bb_prealloc_list) {
                ext4_group_t groupnr;
                struct ext4_prealloc_space *pa;
@@ -1060,9 +1062,9 @@ mb_set_largest_free_order(struct super_block *sb, struct ext4_group_info *grp)
 
 static noinline_for_stack
 void ext4_mb_generate_buddy(struct super_block *sb,
-                               void *buddy, void *bitmap, ext4_group_t group)
+                           void *buddy, void *bitmap, ext4_group_t group,
+                           struct ext4_group_info *grp)
 {
-       struct ext4_group_info *grp = ext4_get_group_info(sb, group);
        struct ext4_sb_info *sbi = EXT4_SB(sb);
        ext4_grpblk_t max = EXT4_CLUSTERS_PER_GROUP(sb);
        ext4_grpblk_t i = 0;
@@ -1181,6 +1183,8 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp)
                        break;
 
                grinfo = ext4_get_group_info(sb, group);
+               if (!grinfo)
+                       continue;
                /*
                 * If page is uptodate then we came here after online resize
                 * which added some new uninitialized group info structs, so
@@ -1246,6 +1250,10 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp)
                                group, page->index, i * blocksize);
                        trace_ext4_mb_buddy_bitmap_load(sb, group);
                        grinfo = ext4_get_group_info(sb, group);
+                       if (!grinfo) {
+                               err = -EFSCORRUPTED;
+                               goto out;
+                       }
                        grinfo->bb_fragments = 0;
                        memset(grinfo->bb_counters, 0,
                               sizeof(*grinfo->bb_counters) *
@@ -1256,7 +1264,7 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp)
                        ext4_lock_group(sb, group);
                        /* init the buddy */
                        memset(data, 0xff, blocksize);
-                       ext4_mb_generate_buddy(sb, data, incore, group);
+                       ext4_mb_generate_buddy(sb, data, incore, group, grinfo);
                        ext4_unlock_group(sb, group);
                        incore = NULL;
                } else {
@@ -1370,6 +1378,9 @@ int ext4_mb_init_group(struct super_block *sb, ext4_group_t group, gfp_t gfp)
        might_sleep();
        mb_debug(sb, "init group %u\n", group);
        this_grp = ext4_get_group_info(sb, group);
+       if (!this_grp)
+               return -EFSCORRUPTED;
+
        /*
         * This ensures that we don't reinit the buddy cache
         * page which map to the group from which we are already
@@ -1444,6 +1455,8 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group,
 
        blocks_per_page = PAGE_SIZE / sb->s_blocksize;
        grp = ext4_get_group_info(sb, group);
+       if (!grp)
+               return -EFSCORRUPTED;
 
        e4b->bd_blkbits = sb->s_blocksize_bits;
        e4b->bd_info = grp;
@@ -2159,6 +2172,8 @@ int ext4_mb_find_by_goal(struct ext4_allocation_context *ac,
        struct ext4_group_info *grp = ext4_get_group_info(ac->ac_sb, group);
        struct ext4_free_extent ex;
 
+       if (!grp)
+               return -EFSCORRUPTED;
        if (!(ac->ac_flags & (EXT4_MB_HINT_TRY_GOAL | EXT4_MB_HINT_GOAL_ONLY)))
                return 0;
        if (grp->bb_free == 0)
@@ -2385,7 +2400,7 @@ static bool ext4_mb_good_group(struct ext4_allocation_context *ac,
 
        BUG_ON(cr < 0 || cr >= 4);
 
-       if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(grp)))
+       if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(grp) || !grp))
                return false;
 
        free = grp->bb_free;
@@ -2454,6 +2469,8 @@ static int ext4_mb_good_group_nolock(struct ext4_allocation_context *ac,
        ext4_grpblk_t free;
        int ret = 0;
 
+       if (!grp)
+               return -EFSCORRUPTED;
        if (sbi->s_mb_stats)
                atomic64_inc(&sbi->s_bal_cX_groups_considered[ac->ac_criteria]);
        if (should_lock) {
@@ -2534,7 +2551,7 @@ ext4_group_t ext4_mb_prefetch(struct super_block *sb, ext4_group_t group,
                 * prefetch once, so we avoid getblk() call, which can
                 * be expensive.
                 */
-               if (!EXT4_MB_GRP_TEST_AND_SET_READ(grp) &&
+               if (gdp && grp && !EXT4_MB_GRP_TEST_AND_SET_READ(grp) &&
                    EXT4_MB_GRP_NEED_INIT(grp) &&
                    ext4_free_group_clusters(sb, gdp) > 0 &&
                    !(ext4_has_group_desc_csum(sb) &&
@@ -2578,7 +2595,7 @@ void ext4_mb_prefetch_fini(struct super_block *sb, ext4_group_t group,
                gdp = ext4_get_group_desc(sb, group, NULL);
                grp = ext4_get_group_info(sb, group);
 
-               if (EXT4_MB_GRP_NEED_INIT(grp) &&
+               if (grp && gdp && EXT4_MB_GRP_NEED_INIT(grp) &&
                    ext4_free_group_clusters(sb, gdp) > 0 &&
                    !(ext4_has_group_desc_csum(sb) &&
                      (gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)))) {
@@ -2837,6 +2854,8 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
                sizeof(struct ext4_group_info);
 
        grinfo = ext4_get_group_info(sb, group);
+       if (!grinfo)
+               return 0;
        /* Load the group info in memory only if not already loaded. */
        if (unlikely(EXT4_MB_GRP_NEED_INIT(grinfo))) {
                err = ext4_mb_load_buddy(sb, group, &e4b);
@@ -2847,7 +2866,7 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
                buddy_loaded = 1;
        }
 
-       memcpy(&sg, ext4_get_group_info(sb, group), i);
+       memcpy(&sg, grinfo, i);
 
        if (buddy_loaded)
                ext4_mb_unload_buddy(&e4b);
@@ -3208,8 +3227,12 @@ static int ext4_mb_init_backend(struct super_block *sb)
 
 err_freebuddy:
        cachep = get_groupinfo_cache(sb->s_blocksize_bits);
-       while (i-- > 0)
-               kmem_cache_free(cachep, ext4_get_group_info(sb, i));
+       while (i-- > 0) {
+               struct ext4_group_info *grp = ext4_get_group_info(sb, i);
+
+               if (grp)
+                       kmem_cache_free(cachep, grp);
+       }
        i = sbi->s_group_info_size;
        rcu_read_lock();
        group_info = rcu_dereference(sbi->s_group_info);
@@ -3522,6 +3545,8 @@ int ext4_mb_release(struct super_block *sb)
                for (i = 0; i < ngroups; i++) {
                        cond_resched();
                        grinfo = ext4_get_group_info(sb, i);
+                       if (!grinfo)
+                               continue;
                        mb_group_bb_bitmap_free(grinfo);
                        ext4_lock_group(sb, i);
                        count = ext4_mb_cleanup_pa(grinfo);
@@ -4606,6 +4631,8 @@ static void ext4_mb_generate_from_freelist(struct super_block *sb, void *bitmap,
        struct ext4_free_data *entry;
 
        grp = ext4_get_group_info(sb, group);
+       if (!grp)
+               return;
        n = rb_first(&(grp->bb_free_root));
 
        while (n) {
@@ -4633,6 +4660,9 @@ void ext4_mb_generate_from_pa(struct super_block *sb, void *bitmap,
        int preallocated = 0;
        int len;
 
+       if (!grp)
+               return;
+
        /* all form of preallocation discards first load group,
         * so the only competing code is preallocation use.
         * we don't need any locking here
@@ -4869,6 +4899,8 @@ adjust_bex:
 
        ei = EXT4_I(ac->ac_inode);
        grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
+       if (!grp)
+               return;
 
        pa->pa_node_lock.inode_lock = &ei->i_prealloc_lock;
        pa->pa_inode = ac->ac_inode;
@@ -4918,6 +4950,8 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
        atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
 
        grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
+       if (!grp)
+               return;
        lg = ac->ac_lg;
        BUG_ON(lg == NULL);
 
@@ -5013,7 +5047,11 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
        trace_ext4_mb_release_group_pa(sb, pa);
        BUG_ON(pa->pa_deleted == 0);
        ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
-       BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
+       if (unlikely(group != e4b->bd_group && pa->pa_len != 0)) {
+               ext4_warning(sb, "bad group: expected %u, group %u, pa_start %llu",
+                            e4b->bd_group, group, pa->pa_pstart);
+               return 0;
+       }
        mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
        atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
        trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
@@ -5043,6 +5081,8 @@ ext4_mb_discard_group_preallocations(struct super_block *sb,
        int err;
        int free = 0;
 
+       if (!grp)
+               return 0;
        mb_debug(sb, "discard preallocation for group %u\n", group);
        if (list_empty(&grp->bb_prealloc_list))
                goto out_dbg;
@@ -5297,6 +5337,9 @@ static inline void ext4_mb_show_pa(struct super_block *sb)
                struct ext4_prealloc_space *pa;
                ext4_grpblk_t start;
                struct list_head *cur;
+
+               if (!grp)
+                       continue;
                ext4_lock_group(sb, i);
                list_for_each(cur, &grp->bb_prealloc_list) {
                        pa = list_entry(cur, struct ext4_prealloc_space,
@@ -6064,6 +6107,7 @@ static void ext4_mb_clear_bb(handle_t *handle, struct inode *inode,
        struct buffer_head *bitmap_bh = NULL;
        struct super_block *sb = inode->i_sb;
        struct ext4_group_desc *gdp;
+       struct ext4_group_info *grp;
        unsigned int overflow;
        ext4_grpblk_t bit;
        struct buffer_head *gd_bh;
@@ -6089,8 +6133,8 @@ do_more:
        overflow = 0;
        ext4_get_group_no_and_offset(sb, block, &block_group, &bit);
 
-       if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(
-                       ext4_get_group_info(sb, block_group))))
+       grp = ext4_get_group_info(sb, block_group);
+       if (unlikely(!grp || EXT4_MB_GRP_BBITMAP_CORRUPT(grp)))
                return;
 
        /*
@@ -6692,6 +6736,8 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)
 
        for (group = first_group; group <= last_group; group++) {
                grp = ext4_get_group_info(sb, group);
+               if (!grp)
+                       continue;
                /* We only do this if the grp has never been initialized */
                if (unlikely(EXT4_MB_GRP_NEED_INIT(grp))) {
                        ret = ext4_mb_init_group(sb, group, GFP_NOFS);
index a19a966..d98ac2a 100644 (file)
@@ -408,7 +408,6 @@ static int free_ext_block(handle_t *handle, struct inode *inode)
 
 int ext4_ext_migrate(struct inode *inode)
 {
-       struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
        handle_t *handle;
        int retval = 0, i;
        __le32 *i_data;
@@ -418,6 +417,7 @@ int ext4_ext_migrate(struct inode *inode)
        unsigned long max_entries;
        __u32 goal, tmp_csum_seed;
        uid_t owner[2];
+       int alloc_ctx;
 
        /*
         * If the filesystem does not support extents, or the inode
@@ -434,7 +434,7 @@ int ext4_ext_migrate(struct inode *inode)
                 */
                return retval;
 
-       percpu_down_write(&sbi->s_writepages_rwsem);
+       alloc_ctx = ext4_writepages_down_write(inode->i_sb);
 
        /*
         * Worst case we can touch the allocation bitmaps and a block
@@ -586,7 +586,7 @@ out_tmp_inode:
        unlock_new_inode(tmp_inode);
        iput(tmp_inode);
 out_unlock:
-       percpu_up_write(&sbi->s_writepages_rwsem);
+       ext4_writepages_up_write(inode->i_sb, alloc_ctx);
        return retval;
 }
 
@@ -605,6 +605,7 @@ int ext4_ind_migrate(struct inode *inode)
        ext4_fsblk_t                    blk;
        handle_t                        *handle;
        int                             ret, ret2 = 0;
+       int                             alloc_ctx;
 
        if (!ext4_has_feature_extents(inode->i_sb) ||
            (!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)))
@@ -621,7 +622,7 @@ int ext4_ind_migrate(struct inode *inode)
        if (test_opt(inode->i_sb, DELALLOC))
                ext4_alloc_da_blocks(inode);
 
-       percpu_down_write(&sbi->s_writepages_rwsem);
+       alloc_ctx = ext4_writepages_down_write(inode->i_sb);
 
        handle = ext4_journal_start(inode, EXT4_HT_MIGRATE, 1);
        if (IS_ERR(handle)) {
@@ -665,6 +666,6 @@ errout:
        ext4_journal_stop(handle);
        up_write(&EXT4_I(inode)->i_data_sem);
 out_unlock:
-       percpu_up_write(&sbi->s_writepages_rwsem);
+       ext4_writepages_up_write(inode->i_sb, alloc_ctx);
        return ret;
 }
index 4022bc7..0aaf38f 100644 (file)
@@ -39,28 +39,36 @@ static void ext4_mmp_csum_set(struct super_block *sb, struct mmp_struct *mmp)
  * Write the MMP block using REQ_SYNC to try to get the block on-disk
  * faster.
  */
-static int write_mmp_block(struct super_block *sb, struct buffer_head *bh)
+static int write_mmp_block_thawed(struct super_block *sb,
+                                 struct buffer_head *bh)
 {
        struct mmp_struct *mmp = (struct mmp_struct *)(bh->b_data);
 
-       /*
-        * We protect against freezing so that we don't create dirty buffers
-        * on frozen filesystem.
-        */
-       sb_start_write(sb);
        ext4_mmp_csum_set(sb, mmp);
        lock_buffer(bh);
        bh->b_end_io = end_buffer_write_sync;
        get_bh(bh);
        submit_bh(REQ_OP_WRITE | REQ_SYNC | REQ_META | REQ_PRIO, bh);
        wait_on_buffer(bh);
-       sb_end_write(sb);
        if (unlikely(!buffer_uptodate(bh)))
                return -EIO;
-
        return 0;
 }
 
+static int write_mmp_block(struct super_block *sb, struct buffer_head *bh)
+{
+       int err;
+
+       /*
+        * We protect against freezing so that we don't create dirty buffers
+        * on frozen filesystem.
+        */
+       sb_start_write(sb);
+       err = write_mmp_block_thawed(sb, bh);
+       sb_end_write(sb);
+       return err;
+}
+
 /*
  * Read the MMP block. It _must_ be read from disk and hence we clear the
  * uptodate flag on the buffer.
@@ -344,7 +352,11 @@ skip:
        seq = mmp_new_seq();
        mmp->mmp_seq = cpu_to_le32(seq);
 
-       retval = write_mmp_block(sb, bh);
+       /*
+        * On mount / remount we are protected against fs freezing (by s_umount
+        * semaphore) and grabbing freeze protection upsets lockdep
+        */
+       retval = write_mmp_block_thawed(sb, bh);
        if (retval)
                goto failed;
 
index a5010b5..45b5798 100644 (file)
@@ -674,7 +674,7 @@ static struct stats dx_show_leaf(struct inode *dir,
                                len = de->name_len;
                                if (!IS_ENCRYPTED(dir)) {
                                        /* Directory is not encrypted */
-                                       ext4fs_dirhash(dir, de->name,
+                                       (void) ext4fs_dirhash(dir, de->name,
                                                de->name_len, &h);
                                        printk("%*.s:(U)%x.%u ", len,
                                               name, h.hash,
@@ -709,8 +709,9 @@ static struct stats dx_show_leaf(struct inode *dir,
                                        if (IS_CASEFOLDED(dir))
                                                h.hash = EXT4_DIRENT_HASH(de);
                                        else
-                                               ext4fs_dirhash(dir, de->name,
-                                                      de->name_len, &h);
+                                               (void) ext4fs_dirhash(dir,
+                                                       de->name,
+                                                       de->name_len, &h);
                                        printk("%*.s:(E)%x.%u ", len, name,
                                               h.hash, (unsigned) ((char *) de
                                                                   - base));
@@ -720,7 +721,8 @@ static struct stats dx_show_leaf(struct inode *dir,
 #else
                                int len = de->name_len;
                                char *name = de->name;
-                               ext4fs_dirhash(dir, de->name, de->name_len, &h);
+                               (void) ext4fs_dirhash(dir, de->name,
+                                                     de->name_len, &h);
                                printk("%*.s:%x.%u ", len, name, h.hash,
                                       (unsigned) ((char *) de - base));
 #endif
@@ -849,8 +851,14 @@ dx_probe(struct ext4_filename *fname, struct inode *dir,
        hinfo->seed = EXT4_SB(dir->i_sb)->s_hash_seed;
        /* hash is already computed for encrypted casefolded directory */
        if (fname && fname_name(fname) &&
-                               !(IS_ENCRYPTED(dir) && IS_CASEFOLDED(dir)))
-               ext4fs_dirhash(dir, fname_name(fname), fname_len(fname), hinfo);
+           !(IS_ENCRYPTED(dir) && IS_CASEFOLDED(dir))) {
+               int ret = ext4fs_dirhash(dir, fname_name(fname),
+                                        fname_len(fname), hinfo);
+               if (ret < 0) {
+                       ret_err = ERR_PTR(ret);
+                       goto fail;
+               }
+       }
        hash = hinfo->hash;
 
        if (root->info.unused_flags & 1) {
@@ -1111,7 +1119,12 @@ static int htree_dirblock_to_tree(struct file *dir_file,
                                hinfo->minor_hash = 0;
                        }
                } else {
-                       ext4fs_dirhash(dir, de->name, de->name_len, hinfo);
+                       err = ext4fs_dirhash(dir, de->name,
+                                            de->name_len, hinfo);
+                       if (err < 0) {
+                               count = err;
+                               goto errout;
+                       }
                }
                if ((hinfo->hash < start_hash) ||
                    ((hinfo->hash == start_hash) &&
@@ -1313,8 +1326,12 @@ static int dx_make_map(struct inode *dir, struct buffer_head *bh,
                if (de->name_len && de->inode) {
                        if (ext4_hash_in_dirent(dir))
                                h.hash = EXT4_DIRENT_HASH(de);
-                       else
-                               ext4fs_dirhash(dir, de->name, de->name_len, &h);
+                       else {
+                               int err = ext4fs_dirhash(dir, de->name,
+                                                    de->name_len, &h);
+                               if (err < 0)
+                                       return err;
+                       }
                        map_tail--;
                        map_tail->hash = h.hash;
                        map_tail->offs = ((char *) de - base)>>2;
@@ -1452,10 +1469,9 @@ int ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *iname,
        hinfo->hash_version = DX_HASH_SIPHASH;
        hinfo->seed = NULL;
        if (cf_name->name)
-               ext4fs_dirhash(dir, cf_name->name, cf_name->len, hinfo);
+               return ext4fs_dirhash(dir, cf_name->name, cf_name->len, hinfo);
        else
-               ext4fs_dirhash(dir, iname->name, iname->len, hinfo);
-       return 0;
+               return ext4fs_dirhash(dir, iname->name, iname->len, hinfo);
 }
 #endif
 
@@ -2298,10 +2314,15 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname,
        fname->hinfo.seed = EXT4_SB(dir->i_sb)->s_hash_seed;
 
        /* casefolded encrypted hashes are computed on fname setup */
-       if (!ext4_hash_in_dirent(dir))
-               ext4fs_dirhash(dir, fname_name(fname),
-                               fname_len(fname), &fname->hinfo);
-
+       if (!ext4_hash_in_dirent(dir)) {
+               int err = ext4fs_dirhash(dir, fname_name(fname),
+                                        fname_len(fname), &fname->hinfo);
+               if (err < 0) {
+                       brelse(bh2);
+                       brelse(bh);
+                       return err;
+               }
+       }
        memset(frames, 0, sizeof(frames));
        frame = frames;
        frame->entries = entries;
index d39f386..9680fe7 100644 (file)
@@ -1048,6 +1048,8 @@ void ext4_mark_group_bitmap_corrupted(struct super_block *sb,
        struct ext4_group_desc *gdp = ext4_get_group_desc(sb, group, NULL);
        int ret;
 
+       if (!grp || !gdp)
+               return;
        if (flags & EXT4_GROUP_INFO_BBITMAP_CORRUPT) {
                ret = ext4_test_and_set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT,
                                            &grp->bb_state);
@@ -3238,11 +3240,9 @@ static __le16 ext4_group_desc_csum(struct super_block *sb, __u32 block_group,
        crc = crc16(crc, (__u8 *)gdp, offset);
        offset += sizeof(gdp->bg_checksum); /* skip checksum */
        /* for checksum of struct ext4_group_desc do the rest...*/
-       if (ext4_has_feature_64bit(sb) &&
-           offset < le16_to_cpu(sbi->s_es->s_desc_size))
+       if (ext4_has_feature_64bit(sb) && offset < sbi->s_desc_size)
                crc = crc16(crc, (__u8 *)gdp + offset,
-                           le16_to_cpu(sbi->s_es->s_desc_size) -
-                               offset);
+                           sbi->s_desc_size - offset);
 
 out:
        return cpu_to_le16(crc);
@@ -5684,8 +5684,9 @@ static int ext4_fill_super(struct super_block *sb, struct fs_context *fc)
                descr = "out journal";
 
        if (___ratelimit(&ext4_mount_msg_ratelimit, "EXT4-fs mount"))
-               ext4_msg(sb, KERN_INFO, "mounted filesystem %pU with%s. "
-                        "Quota mode: %s.", &sb->s_uuid, descr,
+               ext4_msg(sb, KERN_INFO, "mounted filesystem %pU %s with%s. "
+                        "Quota mode: %s.", &sb->s_uuid,
+                        sb_rdonly(sb) ? "ro" : "r/w", descr,
                         ext4_quota_mode(sb));
 
        /* Update the s_overhead_clusters if necessary */
@@ -6387,6 +6388,7 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
        struct ext4_mount_options old_opts;
        ext4_group_t g;
        int err = 0;
+       int enable_rw = 0;
 #ifdef CONFIG_QUOTA
        int enable_quota = 0;
        int i, j;
@@ -6573,7 +6575,7 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
                        if (err)
                                goto restore_opts;
 
-                       sb->s_flags &= ~SB_RDONLY;
+                       enable_rw = 1;
                        if (ext4_has_feature_mmp(sb)) {
                                err = ext4_multi_mount_protect(sb,
                                                le64_to_cpu(es->s_mmp_block));
@@ -6616,9 +6618,6 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
        }
 
 #ifdef CONFIG_QUOTA
-       /* Release old quota file names */
-       for (i = 0; i < EXT4_MAXQUOTAS; i++)
-               kfree(old_opts.s_qf_names[i]);
        if (enable_quota) {
                if (sb_any_quota_suspended(sb))
                        dquot_resume(sb, -1);
@@ -6628,16 +6627,29 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
                                goto restore_opts;
                }
        }
+       /* Release old quota file names */
+       for (i = 0; i < EXT4_MAXQUOTAS; i++)
+               kfree(old_opts.s_qf_names[i]);
 #endif
        if (!test_opt(sb, BLOCK_VALIDITY) && sbi->s_system_blks)
                ext4_release_system_zone(sb);
 
+       if (enable_rw)
+               sb->s_flags &= ~SB_RDONLY;
+
        if (!ext4_has_feature_mmp(sb) || sb_rdonly(sb))
                ext4_stop_mmpd(sbi);
 
        return 0;
 
 restore_opts:
+       /*
+        * If there was a failing r/w to ro transition, we may need to
+        * re-enable quota
+        */
+       if ((sb->s_flags & SB_RDONLY) && !(old_sb_flags & SB_RDONLY) &&
+           sb_any_quota_suspended(sb))
+               dquot_resume(sb, -1);
        sb->s_flags = old_sb_flags;
        sbi->s_mount_opt = old_opts.s_mount_opt;
        sbi->s_mount_opt2 = old_opts.s_mount_opt2;
@@ -6678,8 +6690,9 @@ static int ext4_reconfigure(struct fs_context *fc)
        if (ret < 0)
                return ret;
 
-       ext4_msg(sb, KERN_INFO, "re-mounted %pU. Quota mode: %s.",
-                &sb->s_uuid, ext4_quota_mode(sb));
+       ext4_msg(sb, KERN_INFO, "re-mounted %pU %s. Quota mode: %s.",
+                &sb->s_uuid, sb_rdonly(sb) ? "ro" : "r/w",
+                ext4_quota_mode(sb));
 
        return 0;
 }
index dadad29..dfc2e22 100644 (file)
@@ -2614,6 +2614,7 @@ static int ext4_xattr_move_to_block(handle_t *handle, struct inode *inode,
                .in_inode = !!entry->e_value_inum,
        };
        struct ext4_xattr_ibody_header *header = IHDR(inode, raw_inode);
+       int needs_kvfree = 0;
        int error;
 
        is = kzalloc(sizeof(struct ext4_xattr_ibody_find), GFP_NOFS);
@@ -2636,7 +2637,7 @@ static int ext4_xattr_move_to_block(handle_t *handle, struct inode *inode,
                        error = -ENOMEM;
                        goto out;
                }
-
+               needs_kvfree = 1;
                error = ext4_xattr_inode_get(inode, entry, buffer, value_size);
                if (error)
                        goto out;
@@ -2675,7 +2676,7 @@ static int ext4_xattr_move_to_block(handle_t *handle, struct inode *inode,
 
 out:
        kfree(b_entry_name);
-       if (entry->e_value_inum && buffer)
+       if (needs_kvfree && buffer)
                kvfree(buffer);
        if (is)
                brelse(is->iloc.bh);
index 5eed8c2..a84bf64 100644 (file)
@@ -1419,6 +1419,14 @@ static void gfs2_evict_inode(struct inode *inode)
        if (inode->i_nlink || sb_rdonly(sb) || !ip->i_no_addr)
                goto out;
 
+       /*
+        * In case of an incomplete mount, gfs2_evict_inode() may be called for
+        * system files without having an active journal to write to.  In that
+        * case, skip the filesystem evict.
+        */
+       if (!sdp->sd_jdesc)
+               goto out;
+
        gfs2_holder_mark_uninitialized(&gh);
        ret = evict_should_delete(inode, &gh);
        if (ret == SHOULD_DEFER_EVICTION)
index bacad0c..e63c1d4 100644 (file)
@@ -402,7 +402,7 @@ static struct folio *nfs_readdir_folio_get_locked(struct address_space *mapping,
        struct folio *folio;
 
        folio = filemap_grab_folio(mapping, index);
-       if (!folio)
+       if (IS_ERR(folio))
                return NULL;
        nfs_readdir_folio_init_and_validate(folio, cookie, change_attr);
        return folio;
index 49cfe2a..993375f 100644 (file)
@@ -65,7 +65,7 @@ int inotify_handle_inode_event(struct fsnotify_mark *inode_mark, u32 mask,
        struct fsnotify_event *fsn_event;
        struct fsnotify_group *group = inode_mark->group;
        int ret;
-       int len = 0;
+       int len = 0, wd;
        int alloc_len = sizeof(struct inotify_event_info);
        struct mem_cgroup *old_memcg;
 
@@ -81,6 +81,13 @@ int inotify_handle_inode_event(struct fsnotify_mark *inode_mark, u32 mask,
                              fsn_mark);
 
        /*
+        * We can be racing with mark being detached. Don't report event with
+        * invalid wd.
+        */
+       wd = READ_ONCE(i_mark->wd);
+       if (wd == -1)
+               return 0;
+       /*
         * Whoever is interested in the event, pays for the allocation. Do not
         * trigger OOM killer in the target monitoring memcg as it may have
         * security repercussion.
@@ -110,7 +117,7 @@ int inotify_handle_inode_event(struct fsnotify_mark *inode_mark, u32 mask,
        fsn_event = &event->fse;
        fsnotify_init_event(fsn_event);
        event->mask = mask;
-       event->wd = i_mark->wd;
+       event->wd = wd;
        event->sync_cookie = cookie;
        event->name_len = len;
        if (len)
index ceb17d2..2d88f73 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -342,7 +342,8 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
                        break;
                if (ret)
                        break;
-               if (filp->f_flags & O_NONBLOCK) {
+               if ((filp->f_flags & O_NONBLOCK) ||
+                   (iocb->ki_flags & IOCB_NOWAIT)) {
                        ret = -EAGAIN;
                        break;
                }
@@ -547,7 +548,8 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
                        continue;
 
                /* Wait for buffer space to become available. */
-               if (filp->f_flags & O_NONBLOCK) {
+               if ((filp->f_flags & O_NONBLOCK) ||
+                   (iocb->ki_flags & IOCB_NOWAIT)) {
                        if (!ret)
                                ret = -EAGAIN;
                        break;
index 1b078bb..9b373a0 100644 (file)
@@ -495,10 +495,12 @@ xfs_freesp_init_recs(
                ASSERT(start >= mp->m_ag_prealloc_blocks);
                if (start != mp->m_ag_prealloc_blocks) {
                        /*
-                        * Modify first record to pad stripe align of log
+                        * Modify first record to pad stripe align of log and
+                        * bump the record count.
                         */
                        arec->ar_blockcount = cpu_to_be32(start -
                                                mp->m_ag_prealloc_blocks);
+                       be16_add_cpu(&block->bb_numrecs, 1);
                        nrec = arec + 1;
 
                        /*
@@ -509,7 +511,6 @@ xfs_freesp_init_recs(
                                        be32_to_cpu(arec->ar_startblock) +
                                        be32_to_cpu(arec->ar_blockcount));
                        arec = nrec;
-                       be16_add_cpu(&block->bb_numrecs, 1);
                }
                /*
                 * Change record start to after the internal log
@@ -518,15 +519,13 @@ xfs_freesp_init_recs(
        }
 
        /*
-        * Calculate the record block count and check for the case where
-        * the log might have consumed all available space in the AG. If
-        * so, reset the record count to 0 to avoid exposure of an invalid
-        * record start block.
+        * Calculate the block count of this record; if it is nonzero,
+        * increment the record count.
         */
        arec->ar_blockcount = cpu_to_be32(id->agsize -
                                          be32_to_cpu(arec->ar_startblock));
-       if (!arec->ar_blockcount)
-               block->bb_numrecs = 0;
+       if (arec->ar_blockcount)
+               be16_add_cpu(&block->bb_numrecs, 1);
 }
 
 /*
@@ -538,7 +537,7 @@ xfs_bnoroot_init(
        struct xfs_buf          *bp,
        struct aghdr_init_data  *id)
 {
-       xfs_btree_init_block(mp, bp, XFS_BTNUM_BNO, 0, 1, id->agno);
+       xfs_btree_init_block(mp, bp, XFS_BTNUM_BNO, 0, 0, id->agno);
        xfs_freesp_init_recs(mp, bp, id);
 }
 
@@ -548,7 +547,7 @@ xfs_cntroot_init(
        struct xfs_buf          *bp,
        struct aghdr_init_data  *id)
 {
-       xfs_btree_init_block(mp, bp, XFS_BTNUM_CNT, 0, 1, id->agno);
+       xfs_btree_init_block(mp, bp, XFS_BTNUM_CNT, 0, 0, id->agno);
        xfs_freesp_init_recs(mp, bp, id);
 }
 
index b512de0..cd8870a 100644 (file)
@@ -3494,8 +3494,10 @@ xfs_bmap_btalloc_at_eof(
                if (!caller_pag)
                        args->pag = xfs_perag_get(mp, XFS_FSB_TO_AGNO(mp, ap->blkno));
                error = xfs_alloc_vextent_exact_bno(args, ap->blkno);
-               if (!caller_pag)
+               if (!caller_pag) {
                        xfs_perag_put(args->pag);
+                       args->pag = NULL;
+               }
                if (error)
                        return error;
 
@@ -3505,7 +3507,6 @@ xfs_bmap_btalloc_at_eof(
                 * Exact allocation failed. Reset to try an aligned allocation
                 * according to the original allocation specification.
                 */
-               args->pag = NULL;
                args->alignment = stripe_align;
                args->minlen = nextminlen;
                args->minalignslop = 0;
index 87ab9f9..69bc89d 100644 (file)
@@ -42,12 +42,12 @@ xchk_setup_inode_bmap(
        xfs_ilock(sc->ip, XFS_IOLOCK_EXCL);
 
        /*
-        * We don't want any ephemeral data fork updates sitting around
+        * We don't want any ephemeral data/cow fork updates sitting around
         * while we inspect block mappings, so wait for directio to finish
         * and flush dirty data if we have delalloc reservations.
         */
        if (S_ISREG(VFS_I(sc->ip)->i_mode) &&
-           sc->sm->sm_type == XFS_SCRUB_TYPE_BMBTD) {
+           sc->sm->sm_type != XFS_SCRUB_TYPE_BMBTA) {
                struct address_space    *mapping = VFS_I(sc->ip)->i_mapping;
 
                sc->ilock_flags |= XFS_MMAPLOCK_EXCL;
index 9aa7966..7a20256 100644 (file)
@@ -1164,32 +1164,6 @@ xchk_metadata_inode_forks(
        return 0;
 }
 
-/* Pause background reaping of resources. */
-void
-xchk_stop_reaping(
-       struct xfs_scrub        *sc)
-{
-       sc->flags |= XCHK_REAPING_DISABLED;
-       xfs_blockgc_stop(sc->mp);
-       xfs_inodegc_stop(sc->mp);
-}
-
-/* Restart background reaping of resources. */
-void
-xchk_start_reaping(
-       struct xfs_scrub        *sc)
-{
-       /*
-        * Readonly filesystems do not perform inactivation or speculative
-        * preallocation, so there's no need to restart the workers.
-        */
-       if (!xfs_is_readonly(sc->mp)) {
-               xfs_inodegc_start(sc->mp);
-               xfs_blockgc_start(sc->mp);
-       }
-       sc->flags &= ~XCHK_REAPING_DISABLED;
-}
-
 /*
  * Enable filesystem hooks (i.e. runtime code patching) before starting a scrub
  * operation.  Callers must not hold any locks that intersect with the CPU
index 18b5f2b..791235c 100644 (file)
@@ -156,8 +156,6 @@ static inline bool xchk_skip_xref(struct xfs_scrub_metadata *sm)
 }
 
 int xchk_metadata_inode_forks(struct xfs_scrub *sc);
-void xchk_stop_reaping(struct xfs_scrub *sc);
-void xchk_start_reaping(struct xfs_scrub *sc);
 
 /*
  * Setting up a hook to wait for intents to drain is costly -- we have to take
index faa315b..e382a35 100644 (file)
@@ -150,13 +150,6 @@ xchk_setup_fscounters(
        if (error)
                return error;
 
-       /*
-        * Pause background reclaim while we're scrubbing to reduce the
-        * likelihood of background perturbations to the counters throwing off
-        * our calculations.
-        */
-       xchk_stop_reaping(sc);
-
        return xchk_trans_alloc(sc, 0);
 }
 
@@ -454,6 +447,12 @@ xchk_fscounters(
                xchk_set_corrupt(sc);
 
        /*
+        * XXX: We can't quiesce percpu counter updates, so exit early.
+        * This can be re-enabled when we gain exclusive freeze functionality.
+        */
+       return 0;
+
+       /*
         * If ifree exceeds icount by more than the minimum variance then
         * something's probably wrong with the counters.
         */
index 02819be..3d98f60 100644 (file)
@@ -186,8 +186,6 @@ xchk_teardown(
        }
        if (sc->sm->sm_flags & XFS_SCRUB_IFLAG_REPAIR)
                mnt_drop_write_file(sc->file);
-       if (sc->flags & XCHK_REAPING_DISABLED)
-               xchk_start_reaping(sc);
        if (sc->buf) {
                if (sc->buf_cleanup)
                        sc->buf_cleanup(sc->buf);
index e719034..b38e938 100644 (file)
@@ -106,7 +106,6 @@ struct xfs_scrub {
 
 /* XCHK state flags grow up from zero, XREP state flags grown down from 2^31 */
 #define XCHK_TRY_HARDER                (1 << 0)  /* can't get resources, try again */
-#define XCHK_REAPING_DISABLED  (1 << 1)  /* background block reaping paused */
 #define XCHK_FSGATES_DRAIN     (1 << 2)  /* defer ops draining enabled */
 #define XCHK_NEED_DRAIN                (1 << 3)  /* scrub needs to drain defer ops */
 #define XREP_ALREADY_FIXED     (1 << 31) /* checking our repair work */
index 68efd6f..b3894da 100644 (file)
@@ -98,7 +98,6 @@ TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_FSCOUNTERS);
 
 #define XFS_SCRUB_STATE_STRINGS \
        { XCHK_TRY_HARDER,                      "try_harder" }, \
-       { XCHK_REAPING_DISABLED,                "reaping_disabled" }, \
        { XCHK_FSGATES_DRAIN,                   "fsgates_drain" }, \
        { XCHK_NEED_DRAIN,                      "need_drain" }, \
        { XREP_ALREADY_FIXED,                   "already_fixed" }
index f032d3a..fbb6755 100644 (file)
@@ -558,7 +558,9 @@ xfs_getbmap(
                if (!xfs_iext_next_extent(ifp, &icur, &got)) {
                        xfs_fileoff_t   end = XFS_B_TO_FSB(mp, XFS_ISIZE(ip));
 
-                       out[bmv->bmv_entries - 1].bmv_oflags |= BMV_OF_LAST;
+                       if (bmv->bmv_entries > 0)
+                               out[bmv->bmv_entries - 1].bmv_oflags |=
+                                                               BMV_OF_LAST;
 
                        if (whichfork != XFS_ATTR_FORK && bno < end &&
                            !xfs_getbmap_full(bmv)) {
index 351849f..0f60e30 100644 (file)
@@ -435,18 +435,23 @@ xfs_iget_check_free_state(
 }
 
 /* Make all pending inactivation work start immediately. */
-static void
+static bool
 xfs_inodegc_queue_all(
        struct xfs_mount        *mp)
 {
        struct xfs_inodegc      *gc;
        int                     cpu;
+       bool                    ret = false;
 
        for_each_online_cpu(cpu) {
                gc = per_cpu_ptr(mp->m_inodegc, cpu);
-               if (!llist_empty(&gc->list))
+               if (!llist_empty(&gc->list)) {
                        mod_delayed_work_on(cpu, mp->m_inodegc_wq, &gc->work, 0);
+                       ret = true;
+               }
        }
+
+       return ret;
 }
 
 /*
@@ -1856,6 +1861,8 @@ xfs_inodegc_worker(
        struct xfs_inode        *ip, *n;
        unsigned int            nofs_flag;
 
+       ASSERT(gc->cpu == smp_processor_id());
+
        WRITE_ONCE(gc->items, 0);
 
        if (!node)
@@ -1909,24 +1916,41 @@ xfs_inodegc_flush(
 
 /*
  * Flush all the pending work and then disable the inode inactivation background
- * workers and wait for them to stop.
+ * workers and wait for them to stop.  Caller must hold sb->s_umount to
+ * coordinate changes in the inodegc_enabled state.
  */
 void
 xfs_inodegc_stop(
        struct xfs_mount        *mp)
 {
+       bool                    rerun;
+
        if (!xfs_clear_inodegc_enabled(mp))
                return;
 
+       /*
+        * Drain all pending inodegc work, including inodes that could be
+        * queued by racing xfs_inodegc_queue or xfs_inodegc_shrinker_scan
+        * threads that sample the inodegc state just prior to us clearing it.
+        * The inodegc flag state prevents new threads from queuing more
+        * inodes, so we queue pending work items and flush the workqueue until
+        * all inodegc lists are empty.  IOWs, we cannot use drain_workqueue
+        * here because it does not allow other unserialized mechanisms to
+        * reschedule inodegc work while this draining is in progress.
+        */
        xfs_inodegc_queue_all(mp);
-       drain_workqueue(mp->m_inodegc_wq);
+       do {
+               flush_workqueue(mp->m_inodegc_wq);
+               rerun = xfs_inodegc_queue_all(mp);
+       } while (rerun);
 
        trace_xfs_inodegc_stop(mp, __return_address);
 }
 
 /*
  * Enable the inode inactivation background workers and schedule deferred inode
- * inactivation work if there is any.
+ * inactivation work if there is any.  Caller must hold sb->s_umount to
+ * coordinate changes in the inodegc_enabled state.
  */
 void
 xfs_inodegc_start(
@@ -2069,7 +2093,8 @@ xfs_inodegc_queue(
                queue_delay = 0;
 
        trace_xfs_inodegc_queue(mp, __return_address);
-       mod_delayed_work(mp->m_inodegc_wq, &gc->work, queue_delay);
+       mod_delayed_work_on(current_cpu(), mp->m_inodegc_wq, &gc->work,
+                       queue_delay);
        put_cpu_ptr(gc);
 
        if (xfs_inodegc_want_flush_work(ip, items, shrinker_hits)) {
@@ -2113,7 +2138,8 @@ xfs_inodegc_cpu_dead(
 
        if (xfs_is_inodegc_enabled(mp)) {
                trace_xfs_inodegc_queue(mp, __return_address);
-               mod_delayed_work(mp->m_inodegc_wq, &gc->work, 0);
+               mod_delayed_work_on(current_cpu(), mp->m_inodegc_wq, &gc->work,
+                               0);
        }
        put_cpu_ptr(gc);
 }
index 285885c..18c8f16 100644 (file)
@@ -1006,8 +1006,9 @@ xfs_buffered_write_iomap_begin(
        if (eof)
                imap.br_startoff = end_fsb; /* fake hole until the end */
 
-       /* We never need to allocate blocks for zeroing a hole. */
-       if ((flags & IOMAP_ZERO) && imap.br_startoff > offset_fsb) {
+       /* We never need to allocate blocks for zeroing or unsharing a hole. */
+       if ((flags & (IOMAP_UNSHARE | IOMAP_ZERO)) &&
+           imap.br_startoff > offset_fsb) {
                xfs_hole_to_iomap(ip, iomap, offset_fsb, imap.br_startoff);
                goto out_unlock;
        }
index f3269c0..aaaf5ec 100644 (file)
@@ -66,6 +66,9 @@ struct xfs_inodegc {
        /* approximate count of inodes in the list */
        unsigned int            items;
        unsigned int            shrinker_hits;
+#if defined(DEBUG) || defined(XFS_WARN)
+       unsigned int            cpu;
+#endif
 };
 
 /*
index 4d2e874..7e70625 100644 (file)
@@ -1095,6 +1095,9 @@ xfs_inodegc_init_percpu(
 
        for_each_possible_cpu(cpu) {
                gc = per_cpu_ptr(mp->m_inodegc, cpu);
+#if defined(DEBUG) || defined(XFS_WARN)
+               gc->cpu = cpu;
+#endif
                init_llist_head(&gc->list);
                gc->items = 0;
                INIT_DELAYED_WORK(&gc->work, xfs_inodegc_worker);
index 6c57339..f343bc9 100644 (file)
@@ -236,8 +236,9 @@ void dim_park_tired(struct dim *dim);
  *
  * Calculate the delta between two samples (in data rates).
  * Takes into consideration counter wrap-around.
+ * Returned boolean indicates whether curr_stats are reliable.
  */
-void dim_calc_stats(struct dim_sample *start, struct dim_sample *end,
+bool dim_calc_stats(struct dim_sample *start, struct dim_sample *end,
                    struct dim_stats *curr_stats);
 
 /**
index 0f40f37..6ba7195 100644 (file)
@@ -637,6 +637,23 @@ static inline __be16 vlan_get_protocol(const struct sk_buff *skb)
        return __vlan_get_protocol(skb, skb->protocol, NULL);
 }
 
+/* This version of __vlan_get_protocol() also pulls mac header in skb->head */
+static inline __be16 vlan_get_protocol_and_depth(struct sk_buff *skb,
+                                                __be16 type, int *depth)
+{
+       int maclen;
+
+       type = __vlan_get_protocol(skb, type, &maclen);
+
+       if (type) {
+               if (!pskb_may_pull(skb, maclen))
+                       type = 0;
+               else if (depth)
+                       *depth = maclen;
+       }
+       return type;
+}
+
 /* A getter for the SKB protocol field which will handle VLAN tags consistently
  * whether VLAN acceleration is enabled or not.
  */
index 3399d97..7fe31b2 100644 (file)
@@ -36,6 +36,11 @@ struct io_uring_cmd {
        u8              pdu[32]; /* available inline for free use */
 };
 
+static inline const void *io_uring_sqe_cmd(const struct io_uring_sqe *sqe)
+{
+       return sqe->cmd;
+}
+
 #if defined(CONFIG_IO_URING)
 int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,
                              struct iov_iter *iter, void *ioucmd);
@@ -66,11 +71,6 @@ static inline void io_uring_free(struct task_struct *tsk)
        if (tsk->io_uring)
                __io_uring_free(tsk);
 }
-
-static inline const void *io_uring_sqe_cmd(const struct io_uring_sqe *sqe)
-{
-       return sqe->cmd;
-}
 #else
 static inline int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,
                              struct iov_iter *iter, void *ioucmd)
index 45c3d62..95f33da 100644 (file)
 #define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d
 #define PCI_DEVICE_ID_AMD_19H_M60H_DF_F3 0x14e3
 #define PCI_DEVICE_ID_AMD_19H_M70H_DF_F3 0x14f3
+#define PCI_DEVICE_ID_AMD_19H_M78H_DF_F3 0x12fb
 #define PCI_DEVICE_ID_AMD_CNB17H_F3    0x1703
 #define PCI_DEVICE_ID_AMD_LANCE                0x2000
 #define PCI_DEVICE_ID_AMD_LANCE_HOME   0x2001
index a60a249..0efef2a 100644 (file)
@@ -233,7 +233,7 @@ struct bonding {
         */
        spinlock_t mode_lock;
        spinlock_t stats_lock;
-       u      send_peer_notif;
+       u32      send_peer_notif;
        u8       igmp_retrans;
 #ifdef CONFIG_PROC_FS
        struct   proc_dir_entry *proc_entry;
index 8b7ed71..656ea89 100644 (file)
@@ -2718,7 +2718,7 @@ static inline void sock_recv_cmsgs(struct msghdr *msg, struct sock *sk,
                __sock_recv_cmsgs(msg, sk, skb);
        else if (unlikely(sock_flag(sk, SOCK_TIMESTAMP)))
                sock_write_timestamp(sk, skb->tstamp);
-       else if (unlikely(sk->sk_stamp == SK_DEFAULT_STAMP))
+       else if (unlikely(sock_read_timestamp(sk) == SK_DEFAULT_STAMP))
                sock_write_timestamp(sk, 0);
 }
 
index 68baa81..db016e4 100644 (file)
@@ -10150,8 +10150,20 @@ void perf_tp_event(u16 event_type, u64 count, void *record, int entry_size,
        perf_trace_buf_update(record, event_type);
 
        hlist_for_each_entry_rcu(event, head, hlist_entry) {
-               if (perf_tp_event_match(event, &data, regs))
+               if (perf_tp_event_match(event, &data, regs)) {
                        perf_swevent_event(event, count, &data, regs);
+
+                       /*
+                        * Here use the same on-stack perf_sample_data,
+                        * some members in data are event-specific and
+                        * need to be re-computed for different sweveents.
+                        * Re-initialize data->sample_flags safely to avoid
+                        * the problem that next event skips preparing data
+                        * because data->sample_flags is set.
+                        */
+                       perf_sample_data_init(&data, 0, 0);
+                       perf_sample_save_raw_data(&data, &raw);
+               }
        }
 
        /*
index acb5a50..9eabd58 100644 (file)
@@ -1240,7 +1240,7 @@ static struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem)
 /*
  * lock for reading
  */
-static inline int __down_read_common(struct rw_semaphore *sem, int state)
+static __always_inline int __down_read_common(struct rw_semaphore *sem, int state)
 {
        int ret = 0;
        long count;
@@ -1258,17 +1258,17 @@ out:
        return ret;
 }
 
-static inline void __down_read(struct rw_semaphore *sem)
+static __always_inline void __down_read(struct rw_semaphore *sem)
 {
        __down_read_common(sem, TASK_UNINTERRUPTIBLE);
 }
 
-static inline int __down_read_interruptible(struct rw_semaphore *sem)
+static __always_inline int __down_read_interruptible(struct rw_semaphore *sem)
 {
        return __down_read_common(sem, TASK_INTERRUPTIBLE);
 }
 
-static inline int __down_read_killable(struct rw_semaphore *sem)
+static __always_inline int __down_read_killable(struct rw_semaphore *sem)
 {
        return __down_read_common(sem, TASK_KILLABLE);
 }
index 944c3ae..a68d127 100644 (file)
@@ -11492,7 +11492,7 @@ void call_trace_sched_update_nr_running(struct rq *rq, int count)
 
 #ifdef CONFIG_SCHED_MM_CID
 
-/**
+/*
  * @cid_lock: Guarantee forward-progress of cid allocation.
  *
  * Concurrency ID allocation within a bitmap is mostly lock-free. The cid_lock
@@ -11501,7 +11501,7 @@ void call_trace_sched_update_nr_running(struct rq *rq, int count)
  */
 DEFINE_RAW_SPINLOCK(cid_lock);
 
-/**
+/*
  * @use_cid_lock: Select cid allocation behavior: lock-free vs spinlock.
  *
  * When @use_cid_lock is 0, the cid allocation is lock-free. When contention is
index 93bf2b4..771d1e0 100644 (file)
@@ -35,14 +35,15 @@ static __cacheline_aligned_in_smp DEFINE_RAW_SPINLOCK(tick_broadcast_lock);
 #ifdef CONFIG_TICK_ONESHOT
 static DEFINE_PER_CPU(struct clock_event_device *, tick_oneshot_wakeup_device);
 
-static void tick_broadcast_setup_oneshot(struct clock_event_device *bc);
+static void tick_broadcast_setup_oneshot(struct clock_event_device *bc, bool from_periodic);
 static void tick_broadcast_clear_oneshot(int cpu);
 static void tick_resume_broadcast_oneshot(struct clock_event_device *bc);
 # ifdef CONFIG_HOTPLUG_CPU
 static void tick_broadcast_oneshot_offline(unsigned int cpu);
 # endif
 #else
-static inline void tick_broadcast_setup_oneshot(struct clock_event_device *bc) { BUG(); }
+static inline void
+tick_broadcast_setup_oneshot(struct clock_event_device *bc, bool from_periodic) { BUG(); }
 static inline void tick_broadcast_clear_oneshot(int cpu) { }
 static inline void tick_resume_broadcast_oneshot(struct clock_event_device *bc) { }
 # ifdef CONFIG_HOTPLUG_CPU
@@ -264,7 +265,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
                if (tick_broadcast_device.mode == TICKDEV_MODE_PERIODIC)
                        tick_broadcast_start_periodic(bc);
                else
-                       tick_broadcast_setup_oneshot(bc);
+                       tick_broadcast_setup_oneshot(bc, false);
                ret = 1;
        } else {
                /*
@@ -500,7 +501,7 @@ void tick_broadcast_control(enum tick_broadcast_mode mode)
                        if (tick_broadcast_device.mode == TICKDEV_MODE_PERIODIC)
                                tick_broadcast_start_periodic(bc);
                        else
-                               tick_broadcast_setup_oneshot(bc);
+                               tick_broadcast_setup_oneshot(bc, false);
                }
        }
 out:
@@ -1020,48 +1021,101 @@ static inline ktime_t tick_get_next_period(void)
 /**
  * tick_broadcast_setup_oneshot - setup the broadcast device
  */
-static void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
+static void tick_broadcast_setup_oneshot(struct clock_event_device *bc,
+                                        bool from_periodic)
 {
        int cpu = smp_processor_id();
+       ktime_t nexttick = 0;
 
        if (!bc)
                return;
 
-       /* Set it up only once ! */
-       if (bc->event_handler != tick_handle_oneshot_broadcast) {
-               int was_periodic = clockevent_state_periodic(bc);
-
-               bc->event_handler = tick_handle_oneshot_broadcast;
-
+       /*
+        * When the broadcast device was switched to oneshot by the first
+        * CPU handling the NOHZ change, the other CPUs will reach this
+        * code via hrtimer_run_queues() -> tick_check_oneshot_change()
+        * too. Set up the broadcast device only once!
+        */
+       if (bc->event_handler == tick_handle_oneshot_broadcast) {
                /*
-                * We must be careful here. There might be other CPUs
-                * waiting for periodic broadcast. We need to set the
-                * oneshot_mask bits for those and program the
-                * broadcast device to fire.
+                * The CPU which switched from periodic to oneshot mode
+                * set the broadcast oneshot bit for all other CPUs which
+                * are in the general (periodic) broadcast mask to ensure
+                * that CPUs which wait for the periodic broadcast are
+                * woken up.
+                *
+                * Clear the bit for the local CPU as the set bit would
+                * prevent the first tick_broadcast_enter() after this CPU
+                * switched to oneshot state to program the broadcast
+                * device.
+                *
+                * This code can also be reached via tick_broadcast_control(),
+                * but this cannot avoid the tick_broadcast_clear_oneshot()
+                * as that would break the periodic to oneshot transition of
+                * secondary CPUs. But that's harmless as the below only
+                * clears already cleared bits.
                 */
+               tick_broadcast_clear_oneshot(cpu);
+               return;
+       }
+
+
+       bc->event_handler = tick_handle_oneshot_broadcast;
+       bc->next_event = KTIME_MAX;
+
+       /*
+        * When the tick mode is switched from periodic to oneshot it must
+        * be ensured that CPUs which are waiting for periodic broadcast
+        * get their wake-up at the next tick.  This is achieved by ORing
+        * tick_broadcast_mask into tick_broadcast_oneshot_mask.
+        *
+        * For other callers, e.g. broadcast device replacement,
+        * tick_broadcast_oneshot_mask must not be touched as this would
+        * set bits for CPUs which are already NOHZ, but not idle. Their
+        * next tick_broadcast_enter() would observe the bit set and fail
+        * to update the expiry time and the broadcast event device.
+        */
+       if (from_periodic) {
                cpumask_copy(tmpmask, tick_broadcast_mask);
+               /* Remove the local CPU as it is obviously not idle */
                cpumask_clear_cpu(cpu, tmpmask);
-               cpumask_or(tick_broadcast_oneshot_mask,
-                          tick_broadcast_oneshot_mask, tmpmask);
+               cpumask_or(tick_broadcast_oneshot_mask, tick_broadcast_oneshot_mask, tmpmask);
 
-               if (was_periodic && !cpumask_empty(tmpmask)) {
-                       ktime_t nextevt = tick_get_next_period();
+               /*
+                * Ensure that the oneshot broadcast handler will wake the
+                * CPUs which are still waiting for periodic broadcast.
+                */
+               nexttick = tick_get_next_period();
+               tick_broadcast_init_next_event(tmpmask, nexttick);
 
-                       clockevents_switch_state(bc, CLOCK_EVT_STATE_ONESHOT);
-                       tick_broadcast_init_next_event(tmpmask, nextevt);
-                       tick_broadcast_set_event(bc, cpu, nextevt);
-               } else
-                       bc->next_event = KTIME_MAX;
-       } else {
                /*
-                * The first cpu which switches to oneshot mode sets
-                * the bit for all other cpus which are in the general
-                * (periodic) broadcast mask. So the bit is set and
-                * would prevent the first broadcast enter after this
-                * to program the bc device.
+                * If the underlying broadcast clock event device is
+                * already in oneshot state, then there is nothing to do.
+                * The device was already armed for the next tick
+                * in tick_handle_broadcast_periodic()
                 */
-               tick_broadcast_clear_oneshot(cpu);
+               if (clockevent_state_oneshot(bc))
+                       return;
        }
+
+       /*
+        * When switching from periodic to oneshot mode arm the broadcast
+        * device for the next tick.
+        *
+        * If the broadcast device has been replaced in oneshot mode and
+        * the oneshot broadcast mask is not empty, then arm it to expire
+        * immediately in order to reevaluate the next expiring timer.
+        * @nexttick is 0 and therefore in the past which will cause the
+        * clockevent code to force an event.
+        *
+        * For both cases the programming can be avoided when the oneshot
+        * broadcast mask is empty.
+        *
+        * tick_broadcast_set_event() implicitly switches the broadcast
+        * device to oneshot state.
+        */
+       if (!cpumask_empty(tick_broadcast_oneshot_mask))
+               tick_broadcast_set_event(bc, cpu, nexttick);
 }
 
 /*
@@ -1070,14 +1124,16 @@ static void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
 void tick_broadcast_switch_to_oneshot(void)
 {
        struct clock_event_device *bc;
+       enum tick_device_mode oldmode;
        unsigned long flags;
 
        raw_spin_lock_irqsave(&tick_broadcast_lock, flags);
 
+       oldmode = tick_broadcast_device.mode;
        tick_broadcast_device.mode = TICKDEV_MODE_ONESHOT;
        bc = tick_broadcast_device.evtdev;
        if (bc)
-               tick_broadcast_setup_oneshot(bc);
+               tick_broadcast_setup_oneshot(bc, oldmode == TICKDEV_MODE_PERIODIC);
 
        raw_spin_unlock_irqrestore(&tick_broadcast_lock, flags);
 }
index 38045d6..e89aaf0 100644 (file)
@@ -54,7 +54,7 @@ void dim_park_tired(struct dim *dim)
 }
 EXPORT_SYMBOL(dim_park_tired);
 
-void dim_calc_stats(struct dim_sample *start, struct dim_sample *end,
+bool dim_calc_stats(struct dim_sample *start, struct dim_sample *end,
                    struct dim_stats *curr_stats)
 {
        /* u32 holds up to 71 minutes, should be enough */
@@ -66,7 +66,7 @@ void dim_calc_stats(struct dim_sample *start, struct dim_sample *end,
                             start->comp_ctr);
 
        if (!delta_us)
-               return;
+               return false;
 
        curr_stats->ppms = DIV_ROUND_UP(npkts * USEC_PER_MSEC, delta_us);
        curr_stats->bpms = DIV_ROUND_UP(nbytes * USEC_PER_MSEC, delta_us);
@@ -79,5 +79,6 @@ void dim_calc_stats(struct dim_sample *start, struct dim_sample *end,
        else
                curr_stats->cpe_ratio = 0;
 
+       return true;
 }
 EXPORT_SYMBOL(dim_calc_stats);
index 53f6b9c..4e32f7a 100644 (file)
@@ -227,7 +227,8 @@ void net_dim(struct dim *dim, struct dim_sample end_sample)
                                  dim->start_sample.event_ctr);
                if (nevents < DIM_NEVENTS)
                        break;
-               dim_calc_stats(&dim->start_sample, &end_sample, &curr_stats);
+               if (!dim_calc_stats(&dim->start_sample, &end_sample, &curr_stats))
+                       break;
                if (net_dim_decision(&curr_stats, dim)) {
                        dim->state = DIM_APPLY_NEW_PROFILE;
                        schedule_work(&dim->work);
index 15462d5..88f7794 100644 (file)
@@ -88,7 +88,8 @@ void rdma_dim(struct dim *dim, u64 completions)
                nevents = curr_sample->event_ctr - dim->start_sample.event_ctr;
                if (nevents < DIM_NEVENTS)
                        break;
-               dim_calc_stats(&dim->start_sample, curr_sample, &curr_stats);
+               if (!dim_calc_stats(&dim->start_sample, curr_sample, &curr_stats))
+                       break;
                if (rdma_dim_decision(&curr_stats, dim)) {
                        dim->state = DIM_APPLY_NEW_PROFILE;
                        schedule_work(&dim->work);
index 5774470..84d6dd5 100644 (file)
@@ -42,7 +42,7 @@ int br_dev_queue_push_xmit(struct net *net, struct sock *sk, struct sk_buff *skb
            eth_type_vlan(skb->protocol)) {
                int depth;
 
-               if (!__vlan_get_protocol(skb, skb->protocol, &depth))
+               if (!vlan_get_protocol_and_depth(skb, skb->protocol, &depth))
                        goto drop;
 
                skb_set_network_header(skb, depth);
index 5662dff..176eb58 100644 (file)
@@ -807,18 +807,21 @@ __poll_t datagram_poll(struct file *file, struct socket *sock,
 {
        struct sock *sk = sock->sk;
        __poll_t mask;
+       u8 shutdown;
 
        sock_poll_wait(file, sock, wait);
        mask = 0;
 
        /* exceptional events? */
-       if (sk->sk_err || !skb_queue_empty_lockless(&sk->sk_error_queue))
+       if (READ_ONCE(sk->sk_err) ||
+           !skb_queue_empty_lockless(&sk->sk_error_queue))
                mask |= EPOLLERR |
                        (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);
 
-       if (sk->sk_shutdown & RCV_SHUTDOWN)
+       shutdown = READ_ONCE(sk->sk_shutdown);
+       if (shutdown & RCV_SHUTDOWN)
                mask |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
-       if (sk->sk_shutdown == SHUTDOWN_MASK)
+       if (shutdown == SHUTDOWN_MASK)
                mask |= EPOLLHUP;
 
        /* readable? */
@@ -827,10 +830,12 @@ __poll_t datagram_poll(struct file *file, struct socket *sock,
 
        /* Connection-based need to check for termination and startup */
        if (connection_based(sk)) {
-               if (sk->sk_state == TCP_CLOSE)
+               int state = READ_ONCE(sk->sk_state);
+
+               if (state == TCP_CLOSE)
                        mask |= EPOLLHUP;
                /* connection hasn't started yet? */
-               if (sk->sk_state == TCP_SYN_SENT)
+               if (state == TCP_SYN_SENT)
                        return mask;
        }
 
index 735096d..b3c13e0 100644 (file)
@@ -3335,7 +3335,7 @@ __be16 skb_network_protocol(struct sk_buff *skb, int *depth)
                type = eth->h_proto;
        }
 
-       return __vlan_get_protocol(skb, type, depth);
+       return vlan_get_protocol_and_depth(skb, type, depth);
 }
 
 /* openvswitch calls this on rx path, so we need a different check.
index 26a5860..515ec5c 100644 (file)
@@ -5298,7 +5298,7 @@ bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off)
        u32 csum_end = (u32)start + (u32)off + sizeof(__sum16);
        u32 csum_start = skb_headroom(skb) + (u32)start;
 
-       if (unlikely(csum_start > U16_MAX || csum_end > skb_headlen(skb))) {
+       if (unlikely(csum_start >= U16_MAX || csum_end > skb_headlen(skb))) {
                net_warn_ratelimited("bad partial csum: csum=%u/%u headroom=%u headlen=%u\n",
                                     start, off, skb_headroom(skb), skb_headlen(skb));
                return false;
@@ -5306,7 +5306,7 @@ bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off)
        skb->ip_summed = CHECKSUM_PARTIAL;
        skb->csum_start = csum_start;
        skb->csum_offset = off;
-       skb_set_transport_header(skb, start);
+       skb->transport_header = csum_start;
        return true;
 }
 EXPORT_SYMBOL_GPL(skb_partial_csum_set);
index 434446a..f5c4e47 100644 (file)
@@ -73,8 +73,8 @@ int sk_stream_wait_connect(struct sock *sk, long *timeo_p)
                add_wait_queue(sk_sleep(sk), &wait);
                sk->sk_write_pending++;
                done = sk_wait_event(sk, timeo_p,
-                                    !sk->sk_err &&
-                                    !((1 << sk->sk_state) &
+                                    !READ_ONCE(sk->sk_err) &&
+                                    !((1 << READ_ONCE(sk->sk_state)) &
                                       ~(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT)), &wait);
                remove_wait_queue(sk_sleep(sk), &wait);
                sk->sk_write_pending--;
@@ -87,9 +87,9 @@ EXPORT_SYMBOL(sk_stream_wait_connect);
  * sk_stream_closing - Return 1 if we still have things to send in our buffers.
  * @sk: socket to verify
  */
-static inline int sk_stream_closing(struct sock *sk)
+static int sk_stream_closing(const struct sock *sk)
 {
-       return (1 << sk->sk_state) &
+       return (1 << READ_ONCE(sk->sk_state)) &
               (TCPF_FIN_WAIT1 | TCPF_CLOSING | TCPF_LAST_ACK);
 }
 
@@ -142,8 +142,8 @@ int sk_stream_wait_memory(struct sock *sk, long *timeo_p)
 
                set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
                sk->sk_write_pending++;
-               sk_wait_event(sk, &current_timeo, sk->sk_err ||
-                                                 (sk->sk_shutdown & SEND_SHUTDOWN) ||
+               sk_wait_event(sk, &current_timeo, READ_ONCE(sk->sk_err) ||
+                                                 (READ_ONCE(sk->sk_shutdown) & SEND_SHUTDOWN) ||
                                                  (sk_stream_memory_free(sk) &&
                                                  !vm_wait), &wait);
                sk->sk_write_pending--;
index 940062e..c4aab3a 100644 (file)
@@ -894,7 +894,7 @@ int inet_shutdown(struct socket *sock, int how)
                   EPOLLHUP, even on eg. unconnected UDP sockets -- RR */
                fallthrough;
        default:
-               sk->sk_shutdown |= how;
+               WRITE_ONCE(sk->sk_shutdown, sk->sk_shutdown | how);
                if (sk->sk_prot->shutdown)
                        sk->sk_prot->shutdown(sk, how);
                break;
index 20db115..4d6392c 100644 (file)
@@ -498,6 +498,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
        __poll_t mask;
        struct sock *sk = sock->sk;
        const struct tcp_sock *tp = tcp_sk(sk);
+       u8 shutdown;
        int state;
 
        sock_poll_wait(file, sock, wait);
@@ -540,9 +541,10 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
         * NOTE. Check for TCP_CLOSE is added. The goal is to prevent
         * blocking on fresh not-connected or disconnected socket. --ANK
         */
-       if (sk->sk_shutdown == SHUTDOWN_MASK || state == TCP_CLOSE)
+       shutdown = READ_ONCE(sk->sk_shutdown);
+       if (shutdown == SHUTDOWN_MASK || state == TCP_CLOSE)
                mask |= EPOLLHUP;
-       if (sk->sk_shutdown & RCV_SHUTDOWN)
+       if (shutdown & RCV_SHUTDOWN)
                mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;
 
        /* Connected or passive Fast Open socket? */
@@ -559,7 +561,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
                if (tcp_stream_is_readable(sk, target))
                        mask |= EPOLLIN | EPOLLRDNORM;
 
-               if (!(sk->sk_shutdown & SEND_SHUTDOWN)) {
+               if (!(shutdown & SEND_SHUTDOWN)) {
                        if (__sk_stream_is_writeable(sk, 1)) {
                                mask |= EPOLLOUT | EPOLLWRNORM;
                        } else {  /* send SIGIO later */
@@ -2867,7 +2869,7 @@ void __tcp_close(struct sock *sk, long timeout)
        int data_was_unread = 0;
        int state;
 
-       sk->sk_shutdown = SHUTDOWN_MASK;
+       WRITE_ONCE(sk->sk_shutdown, SHUTDOWN_MASK);
 
        if (sk->sk_state == TCP_LISTEN) {
                tcp_set_state(sk, TCP_CLOSE);
@@ -3119,7 +3121,7 @@ int tcp_disconnect(struct sock *sk, int flags)
 
        inet_bhash2_reset_saddr(sk);
 
-       sk->sk_shutdown = 0;
+       WRITE_ONCE(sk->sk_shutdown, 0);
        sock_reset_flag(sk, SOCK_DONE);
        tp->srtt_us = 0;
        tp->mdev_us = jiffies_to_usecs(TCP_TIMEOUT_INIT);
@@ -4649,7 +4651,7 @@ void tcp_done(struct sock *sk)
        if (req)
                reqsk_fastopen_remove(sk, req, false);
 
-       sk->sk_shutdown = SHUTDOWN_MASK;
+       WRITE_ONCE(sk->sk_shutdown, SHUTDOWN_MASK);
 
        if (!sock_flag(sk, SOCK_DEAD))
                sk->sk_state_change(sk);
index ebf9175..2e95474 100644 (file)
@@ -168,7 +168,7 @@ static int tcp_msg_wait_data(struct sock *sk, struct sk_psock *psock,
        sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk);
        ret = sk_wait_event(sk, &timeo,
                            !list_empty(&psock->ingress_msg) ||
-                           !skb_queue_empty(&sk->sk_receive_queue), &wait);
+                           !skb_queue_empty_lockless(&sk->sk_receive_queue), &wait);
        sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk);
        remove_wait_queue(sk_sleep(sk), &wait);
        return ret;
index a057330..61b6710 100644 (file)
@@ -4362,7 +4362,7 @@ void tcp_fin(struct sock *sk)
 
        inet_csk_schedule_ack(sk);
 
-       sk->sk_shutdown |= RCV_SHUTDOWN;
+       WRITE_ONCE(sk->sk_shutdown, sk->sk_shutdown | RCV_SHUTDOWN);
        sock_set_flag(sk, SOCK_DONE);
 
        switch (sk->sk_state) {
@@ -6599,7 +6599,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)
                        break;
 
                tcp_set_state(sk, TCP_FIN_WAIT2);
-               sk->sk_shutdown |= SEND_SHUTDOWN;
+               WRITE_ONCE(sk->sk_shutdown, sk->sk_shutdown | SEND_SHUTDOWN);
 
                sk_dst_confirm(sk);
 
index da7fe94..9ffbc66 100644 (file)
@@ -583,7 +583,8 @@ static int llc_ui_wait_for_disc(struct sock *sk, long timeout)
 
        add_wait_queue(sk_sleep(sk), &wait);
        while (1) {
-               if (sk_wait_event(sk, &timeout, sk->sk_state == TCP_CLOSE, &wait))
+               if (sk_wait_event(sk, &timeout,
+                                 READ_ONCE(sk->sk_state) == TCP_CLOSE, &wait))
                        break;
                rc = -ERESTARTSYS;
                if (signal_pending(current))
@@ -603,7 +604,8 @@ static bool llc_ui_wait_for_conn(struct sock *sk, long timeout)
 
        add_wait_queue(sk_sleep(sk), &wait);
        while (1) {
-               if (sk_wait_event(sk, &timeout, sk->sk_state != TCP_SYN_SENT, &wait))
+               if (sk_wait_event(sk, &timeout,
+                                 READ_ONCE(sk->sk_state) != TCP_SYN_SENT, &wait))
                        break;
                if (signal_pending(current) || !timeout)
                        break;
@@ -622,7 +624,7 @@ static int llc_ui_wait_for_busy_core(struct sock *sk, long timeout)
        while (1) {
                rc = 0;
                if (sk_wait_event(sk, &timeout,
-                                 (sk->sk_shutdown & RCV_SHUTDOWN) ||
+                                 (READ_ONCE(sk->sk_shutdown) & RCV_SHUTDOWN) ||
                                  (!llc_data_accept_state(llc->state) &&
                                   !llc->remote_busy_flag &&
                                   !llc->p_flag), &wait))
index f0783e4..5f76ae8 100644 (file)
@@ -711,9 +711,11 @@ void nf_conntrack_destroy(struct nf_conntrack *nfct)
 
        rcu_read_lock();
        ct_hook = rcu_dereference(nf_ct_hook);
-       BUG_ON(ct_hook == NULL);
-       ct_hook->destroy(nfct);
+       if (ct_hook)
+               ct_hook->destroy(nfct);
        rcu_read_unlock();
+
+       WARN_ON(!ct_hook);
 }
 EXPORT_SYMBOL(nf_conntrack_destroy);
 
index 57f6724..169e16f 100644 (file)
@@ -1218,11 +1218,12 @@ static int __init nf_conntrack_standalone_init(void)
        nf_conntrack_htable_size_user = nf_conntrack_htable_size;
 #endif
 
+       nf_conntrack_init_end();
+
        ret = register_pernet_subsys(&nf_conntrack_net_ops);
        if (ret < 0)
                goto out_pernet;
 
-       nf_conntrack_init_end();
        return 0;
 
 out_pernet:
index c3563f0..680fe55 100644 (file)
@@ -344,6 +344,12 @@ static void nft_netdev_event(unsigned long event, struct net_device *dev,
                return;
        }
 
+       /* UNREGISTER events are also happening on netns exit.
+        *
+        * Although nf_tables core releases all tables/chains, only this event
+        * handler provides guarantee that hook->ops.dev is still accessible,
+        * so we cannot skip exiting net namespaces.
+        */
        __nft_release_basechain(ctx);
 }
 
@@ -362,9 +368,6 @@ static int nf_tables_netdev_event(struct notifier_block *this,
            event != NETDEV_CHANGENAME)
                return NOTIFY_DONE;
 
-       if (!check_net(ctx.net))
-               return NOTIFY_DONE;
-
        nft_net = nft_pernet(ctx.net);
        mutex_lock(&nft_net->commit_mutex);
        list_for_each_entry(table, &nft_net->tables, list) {
index 7ef8b9a..c878041 100644 (file)
@@ -1990,7 +1990,7 @@ static int netlink_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
 
        skb_free_datagram(sk, skb);
 
-       if (nlk->cb_running &&
+       if (READ_ONCE(nlk->cb_running) &&
            atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf / 2) {
                ret = netlink_dump(sk);
                if (ret) {
@@ -2302,7 +2302,7 @@ static int netlink_dump(struct sock *sk)
        if (cb->done)
                cb->done(cb);
 
-       nlk->cb_running = false;
+       WRITE_ONCE(nlk->cb_running, false);
        module = cb->module;
        skb = cb->skb;
        mutex_unlock(nlk->cb_mutex);
@@ -2365,7 +2365,7 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
                        goto error_put;
        }
 
-       nlk->cb_running = true;
+       WRITE_ONCE(nlk->cb_running, true);
        nlk->dump_done_errno = INT_MAX;
 
        mutex_unlock(nlk->cb_mutex);
@@ -2703,7 +2703,7 @@ static int netlink_native_seq_show(struct seq_file *seq, void *v)
                           nlk->groups ? (u32)nlk->groups[0] : 0,
                           sk_rmem_alloc_get(s),
                           sk_wmem_alloc_get(s),
-                          nlk->cb_running,
+                          READ_ONCE(nlk->cb_running),
                           refcount_read(&s->sk_refcnt),
                           atomic_read(&s->sk_drops),
                           sock_i_ino(s)
index 640d94e..94c6a1f 100644 (file)
@@ -1934,10 +1934,8 @@ static void packet_parse_headers(struct sk_buff *skb, struct socket *sock)
        /* Move network header to the right position for VLAN tagged packets */
        if (likely(skb->dev->type == ARPHRD_ETHER) &&
            eth_type_vlan(skb->protocol) &&
-           __vlan_get_protocol(skb, skb->protocol, &depth) != 0) {
-               if (pskb_may_pull(skb, depth))
-                       skb_set_network_header(skb, depth);
-       }
+           vlan_get_protocol_and_depth(skb, skb->protocol, &depth) != 0)
+               skb_set_network_header(skb, depth);
 
        skb_probe_transport_header(skb);
 }
index 31db743..dbdf03e 100644 (file)
@@ -67,8 +67,8 @@ static void smc_close_stream_wait(struct smc_sock *smc, long timeout)
 
                rc = sk_wait_event(sk, &timeout,
                                   !smc_tx_prepared_sends(&smc->conn) ||
-                                  sk->sk_err == ECONNABORTED ||
-                                  sk->sk_err == ECONNRESET ||
+                                  READ_ONCE(sk->sk_err) == ECONNABORTED ||
+                                  READ_ONCE(sk->sk_err) == ECONNRESET ||
                                   smc->conn.killed,
                                   &wait);
                if (rc)
index 4380d32..9a2f363 100644 (file)
@@ -267,9 +267,9 @@ int smc_rx_wait(struct smc_sock *smc, long *timeo,
        sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk);
        add_wait_queue(sk_sleep(sk), &wait);
        rc = sk_wait_event(sk, timeo,
-                          sk->sk_err ||
+                          READ_ONCE(sk->sk_err) ||
                           cflags->peer_conn_abort ||
-                          sk->sk_shutdown & RCV_SHUTDOWN ||
+                          READ_ONCE(sk->sk_shutdown) & RCV_SHUTDOWN ||
                           conn->killed ||
                           fcrit(conn),
                           &wait);
index f4b6a71..4512844 100644 (file)
@@ -113,8 +113,8 @@ static int smc_tx_wait(struct smc_sock *smc, int flags)
                        break; /* at least 1 byte of free & no urgent data */
                set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
                sk_wait_event(sk, &timeo,
-                             sk->sk_err ||
-                             (sk->sk_shutdown & SEND_SHUTDOWN) ||
+                             READ_ONCE(sk->sk_err) ||
+                             (READ_ONCE(sk->sk_shutdown) & SEND_SHUTDOWN) ||
                              smc_cdc_rxed_any_close(conn) ||
                              (atomic_read(&conn->sndbuf_space) &&
                               !conn->urg_tx_pend),
index a7b4b37..b7e01d0 100644 (file)
@@ -2911,7 +2911,7 @@ static int do_recvmmsg(int fd, struct mmsghdr __user *mmsg,
                 * error to return on the next call or if the
                 * app asks about it using getsockopt(SO_ERROR).
                 */
-               sock->sk->sk_err = -err;
+               WRITE_ONCE(sock->sk->sk_err, -err);
        }
 out_put:
        fput_light(sock->file, fput_needed);
index 37edfe1..dd73d71 100644 (file)
@@ -314,9 +314,9 @@ static void tsk_rej_rx_queue(struct sock *sk, int error)
                tipc_sk_respond(sk, skb, error);
 }
 
-static bool tipc_sk_connected(struct sock *sk)
+static bool tipc_sk_connected(const struct sock *sk)
 {
-       return sk->sk_state == TIPC_ESTABLISHED;
+       return READ_ONCE(sk->sk_state) == TIPC_ESTABLISHED;
 }
 
 /* tipc_sk_type_connectionless - check if the socket is datagram socket
index b32c112..f2e7302 100644 (file)
@@ -111,7 +111,8 @@ int wait_on_pending_writer(struct sock *sk, long *timeo)
                        break;
                }
 
-               if (sk_wait_event(sk, timeo, !sk->sk_write_pending, &wait))
+               if (sk_wait_event(sk, timeo,
+                                 !READ_ONCE(sk->sk_write_pending), &wait))
                        break;
        }
        remove_wait_queue(sk_sleep(sk), &wait);
index fb31e8a..cc695c9 100644 (file)
@@ -603,7 +603,7 @@ static void unix_release_sock(struct sock *sk, int embrion)
        /* Clear state */
        unix_state_lock(sk);
        sock_orphan(sk);
-       sk->sk_shutdown = SHUTDOWN_MASK;
+       WRITE_ONCE(sk->sk_shutdown, SHUTDOWN_MASK);
        path         = u->path;
        u->path.dentry = NULL;
        u->path.mnt = NULL;
@@ -628,7 +628,7 @@ static void unix_release_sock(struct sock *sk, int embrion)
                if (sk->sk_type == SOCK_STREAM || sk->sk_type == SOCK_SEQPACKET) {
                        unix_state_lock(skpair);
                        /* No more writes */
-                       skpair->sk_shutdown = SHUTDOWN_MASK;
+                       WRITE_ONCE(skpair->sk_shutdown, SHUTDOWN_MASK);
                        if (!skb_queue_empty(&sk->sk_receive_queue) || embrion)
                                WRITE_ONCE(skpair->sk_err, ECONNRESET);
                        unix_state_unlock(skpair);
@@ -1442,7 +1442,7 @@ static long unix_wait_for_peer(struct sock *other, long timeo)
 
        sched = !sock_flag(other, SOCK_DEAD) &&
                !(other->sk_shutdown & RCV_SHUTDOWN) &&
-               unix_recvq_full(other);
+               unix_recvq_full_lockless(other);
 
        unix_state_unlock(other);
 
@@ -3008,7 +3008,7 @@ static int unix_shutdown(struct socket *sock, int mode)
        ++mode;
 
        unix_state_lock(sk);
-       sk->sk_shutdown |= mode;
+       WRITE_ONCE(sk->sk_shutdown, sk->sk_shutdown | mode);
        other = unix_peer(sk);
        if (other)
                sock_hold(other);
@@ -3028,7 +3028,7 @@ static int unix_shutdown(struct socket *sock, int mode)
                if (mode&SEND_SHUTDOWN)
                        peer_mode |= RCV_SHUTDOWN;
                unix_state_lock(other);
-               other->sk_shutdown |= peer_mode;
+               WRITE_ONCE(other->sk_shutdown, other->sk_shutdown | peer_mode);
                unix_state_unlock(other);
                other->sk_state_change(other);
                if (peer_mode == SHUTDOWN_MASK)
@@ -3160,16 +3160,18 @@ static __poll_t unix_poll(struct file *file, struct socket *sock, poll_table *wa
 {
        struct sock *sk = sock->sk;
        __poll_t mask;
+       u8 shutdown;
 
        sock_poll_wait(file, sock, wait);
        mask = 0;
+       shutdown = READ_ONCE(sk->sk_shutdown);
 
        /* exceptional events? */
        if (READ_ONCE(sk->sk_err))
                mask |= EPOLLERR;
-       if (sk->sk_shutdown == SHUTDOWN_MASK)
+       if (shutdown == SHUTDOWN_MASK)
                mask |= EPOLLHUP;
-       if (sk->sk_shutdown & RCV_SHUTDOWN)
+       if (shutdown & RCV_SHUTDOWN)
                mask |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
 
        /* readable? */
@@ -3203,9 +3205,11 @@ static __poll_t unix_dgram_poll(struct file *file, struct socket *sock,
        struct sock *sk = sock->sk, *other;
        unsigned int writable;
        __poll_t mask;
+       u8 shutdown;
 
        sock_poll_wait(file, sock, wait);
        mask = 0;
+       shutdown = READ_ONCE(sk->sk_shutdown);
 
        /* exceptional events? */
        if (READ_ONCE(sk->sk_err) ||
@@ -3213,9 +3217,9 @@ static __poll_t unix_dgram_poll(struct file *file, struct socket *sock,
                mask |= EPOLLERR |
                        (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);
 
-       if (sk->sk_shutdown & RCV_SHUTDOWN)
+       if (shutdown & RCV_SHUTDOWN)
                mask |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
-       if (sk->sk_shutdown == SHUTDOWN_MASK)
+       if (shutdown == SHUTDOWN_MASK)
                mask |= EPOLLHUP;
 
        /* readable? */
index c4e53f2..de3933a 100644 (file)
@@ -19,7 +19,7 @@ void register_cxl_mock_ops(struct cxl_mock_ops *ops)
 }
 EXPORT_SYMBOL_GPL(register_cxl_mock_ops);
 
-static DEFINE_SRCU(cxl_mock_srcu);
+DEFINE_STATIC_SRCU(cxl_mock_srcu);
 
 void unregister_cxl_mock_ops(struct cxl_mock_ops *ops)
 {
index db29a31..607ba5c 100755 (executable)
@@ -6,6 +6,7 @@
 ALL_TESTS="
        prio
        arp_validate
+       num_grat_arp
 "
 
 REQUIRE_MZ=no
@@ -255,6 +256,55 @@ arp_validate()
        arp_validate_ns "active-backup"
 }
 
+garp_test()
+{
+       local param="$1"
+       local active_slave exp_num real_num i
+       RET=0
+
+       # create bond
+       bond_reset "${param}"
+
+       bond_check_connection
+       [ $RET -ne 0 ] && log_test "num_grat_arp" "$retmsg"
+
+
+       # Add tc rules to count GARP number
+       for i in $(seq 0 2); do
+               tc -n ${g_ns} filter add dev s$i ingress protocol arp pref 1 handle 101 \
+                       flower skip_hw arp_op request arp_sip ${s_ip4} arp_tip ${s_ip4} action pass
+       done
+
+       # Do failover
+       active_slave=$(cmd_jq "ip -n ${s_ns} -d -j link show bond0" ".[].linkinfo.info_data.active_slave")
+       ip -n ${s_ns} link set ${active_slave} down
+
+       exp_num=$(echo "${param}" | cut -f6 -d ' ')
+       sleep $((exp_num + 2))
+
+       active_slave=$(cmd_jq "ip -n ${s_ns} -d -j link show bond0" ".[].linkinfo.info_data.active_slave")
+
+       # check result
+       real_num=$(tc_rule_handle_stats_get "dev s${active_slave#eth} ingress" 101 ".packets" "-n ${g_ns}")
+       if [ "${real_num}" -ne "${exp_num}" ]; then
+               echo "$real_num garp packets sent on active slave ${active_slave}"
+               RET=1
+       fi
+
+       for i in $(seq 0 2); do
+               tc -n ${g_ns} filter del dev s$i ingress
+       done
+}
+
+num_grat_arp()
+{
+       local val
+       for val in 10 20 30 50; do
+               garp_test "mode active-backup miimon 100 num_grat_arp $val peer_notify_delay 1000"
+               log_test "num_grat_arp" "active-backup miimon num_grat_arp $val"
+       done
+}
+
 trap cleanup EXIT
 
 setup_prepare
index 4045ca9..69ab99a 100644 (file)
@@ -61,6 +61,8 @@ server_create()
                ip -n ${g_ns} link set s${i} up
                ip -n ${g_ns} link set s${i} master br0
                ip -n ${s_ns} link set eth${i} master bond0
+
+               tc -n ${g_ns} qdisc add dev s${i} clsact
        done
 
        ip -n ${s_ns} link set bond0 up
index 057c3d0..9ddb68d 100755 (executable)
@@ -791,8 +791,9 @@ tc_rule_handle_stats_get()
        local id=$1; shift
        local handle=$1; shift
        local selector=${1:-.packets}; shift
+       local netns=${1:-""}; shift
 
-       tc -j -s filter show $id \
+       tc $netns -j -s filter show $id \
            | jq ".[] | select(.options.handle == $handle) | \
                  .options.actions[0].stats$selector"
 }
index 7060bae..a32f490 100755 (executable)
@@ -188,6 +188,26 @@ if [ $? -ne 0 ]; then
        exit $ksft_skip
 fi
 
+ip netns exec $ns2 nft -f - <<EOF
+table inet filter {
+   counter ip4dscp0 { }
+   counter ip4dscp3 { }
+
+   chain input {
+      type filter hook input priority 0; policy accept;
+      meta l4proto tcp goto {
+             ip dscp cs3 counter name ip4dscp3 accept
+             ip dscp 0 counter name ip4dscp0 accept
+      }
+   }
+}
+EOF
+
+if [ $? -ne 0 ]; then
+       echo "SKIP: Could not load nft ruleset"
+       exit $ksft_skip
+fi
+
 # test basic connectivity
 if ! ip netns exec $ns1 ping -c 1 -q 10.0.2.99 > /dev/null; then
   echo "ERROR: $ns1 cannot reach ns2" 1>&2
@@ -255,6 +275,60 @@ check_counters()
        fi
 }
 
+check_dscp()
+{
+       local what=$1
+       local ok=1
+
+       local counter=$(ip netns exec $ns2 nft reset counter inet filter ip4dscp3 | grep packets)
+
+       local pc4=${counter%*bytes*}
+       local pc4=${pc4#*packets}
+
+       local counter=$(ip netns exec $ns2 nft reset counter inet filter ip4dscp0 | grep packets)
+       local pc4z=${counter%*bytes*}
+       local pc4z=${pc4z#*packets}
+
+       case "$what" in
+       "dscp_none")
+               if [ $pc4 -gt 0 ] || [ $pc4z -eq 0 ]; then
+                       echo "FAIL: dscp counters do not match, expected dscp3 == 0, dscp0 > 0, but got $pc4,$pc4z" 1>&2
+                       ret=1
+                       ok=0
+               fi
+               ;;
+       "dscp_fwd")
+               if [ $pc4 -eq 0 ] || [ $pc4z -eq 0 ]; then
+                       echo "FAIL: dscp counters do not match, expected dscp3 and dscp0 > 0 but got $pc4,$pc4z" 1>&2
+                       ret=1
+                       ok=0
+               fi
+               ;;
+       "dscp_ingress")
+               if [ $pc4 -eq 0 ] || [ $pc4z -gt 0 ]; then
+                       echo "FAIL: dscp counters do not match, expected dscp3 > 0, dscp0 == 0 but got $pc4,$pc4z" 1>&2
+                       ret=1
+                       ok=0
+               fi
+               ;;
+       "dscp_egress")
+               if [ $pc4 -eq 0 ] || [ $pc4z -gt 0 ]; then
+                       echo "FAIL: dscp counters do not match, expected dscp3 > 0, dscp0 == 0 but got $pc4,$pc4z" 1>&2
+                       ret=1
+                       ok=0
+               fi
+               ;;
+       *)
+               echo "FAIL: Unknown DSCP check" 1>&2
+               ret=1
+               ok=0
+       esac
+
+       if [ $ok -eq 1 ] ;then
+               echo "PASS: $what: dscp packet counters match"
+       fi
+}
+
 check_transfer()
 {
        in=$1
@@ -286,17 +360,26 @@ test_tcp_forwarding_ip()
        ip netns exec $nsa nc -w 4 "$dstip" "$dstport" < "$nsin" > "$ns1out" &
        cpid=$!
 
-       sleep 3
+       sleep 1
 
-       if ps -p $lpid > /dev/null;then
+       prev="$(ls -l $ns1out $ns2out)"
+       sleep 1
+
+       while [[ "$prev" != "$(ls -l $ns1out $ns2out)" ]]; do
+               sleep 1;
+               prev="$(ls -l $ns1out $ns2out)"
+       done
+
+       if test -d /proc/"$lpid"/; then
                kill $lpid
        fi
 
-       if ps -p $cpid > /dev/null;then
+       if test -d /proc/"$cpid"/; then
                kill $cpid
        fi
 
-       wait
+       wait $lpid
+       wait $cpid
 
        if ! check_transfer "$nsin" "$ns2out" "ns1 -> ns2"; then
                lret=1
@@ -316,6 +399,51 @@ test_tcp_forwarding()
        return $?
 }
 
+test_tcp_forwarding_set_dscp()
+{
+       check_dscp "dscp_none"
+
+ip netns exec $nsr1 nft -f - <<EOF
+table netdev dscpmangle {
+   chain setdscp0 {
+      type filter hook ingress device "veth0" priority 0; policy accept
+       ip dscp set cs3
+  }
+}
+EOF
+if [ $? -eq 0 ]; then
+       test_tcp_forwarding_ip "$1" "$2"  10.0.2.99 12345
+       check_dscp "dscp_ingress"
+
+       ip netns exec $nsr1 nft delete table netdev dscpmangle
+else
+       echo "SKIP: Could not load netdev:ingress for veth0"
+fi
+
+ip netns exec $nsr1 nft -f - <<EOF
+table netdev dscpmangle {
+   chain setdscp0 {
+      type filter hook egress device "veth1" priority 0; policy accept
+      ip dscp set cs3
+  }
+}
+EOF
+if [ $? -eq 0 ]; then
+       test_tcp_forwarding_ip "$1" "$2"  10.0.2.99 12345
+       check_dscp "dscp_egress"
+
+       ip netns exec $nsr1 nft flush table netdev dscpmangle
+else
+       echo "SKIP: Could not load netdev:egress for veth1"
+fi
+
+       # partial.  If flowtable really works, then both dscp-is-0 and dscp-is-cs3
+       # counters should have seen packets (before and after ft offload kicks in).
+       ip netns exec $nsr1 nft -a insert rule inet filter forward ip dscp set cs3
+       test_tcp_forwarding_ip "$1" "$2"  10.0.2.99 12345
+       check_dscp "dscp_fwd"
+}
+
 test_tcp_forwarding_nat()
 {
        local lret
@@ -385,6 +513,11 @@ table ip nat {
 }
 EOF
 
+if ! test_tcp_forwarding_set_dscp $ns1 $ns2 0 ""; then
+       echo "FAIL: flow offload for ns1/ns2 with dscp update" 1>&2
+       exit 0
+fi
+
 if ! test_tcp_forwarding_nat $ns1 $ns2 0 ""; then
        echo "FAIL: flow offload for ns1/ns2 with NAT" 1>&2
        ip netns exec $nsr1 nft list ruleset
@@ -489,8 +622,8 @@ ip -net $nsr1 addr add 10.0.1.1/24 dev veth0
 ip -net $nsr1 addr add dead:1::1/64 dev veth0
 ip -net $nsr1 link set up dev veth0
 
-KEY_SHA="0x"$(ps -xaf | sha1sum | cut -d " " -f 1)
-KEY_AES="0x"$(ps -xaf | md5sum | cut -d " " -f 1)
+KEY_SHA="0x"$(ps -af | sha1sum | cut -d " " -f 1)
+KEY_AES="0x"$(ps -af | md5sum | cut -d " " -f 1)
 SPI1=$RANDOM
 SPI2=$RANDOM