]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 10 Jul 2025 17:08:47 +0000 (10:08 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 10 Jul 2025 17:10:49 +0000 (10:10 -0700)
Cross-merge networking fixes after downstream PR (net-6.16-rc6).

No conflicts.

Adjacent changes:

Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml
  0a12c435a1d6 ("dt-bindings: net: sun8i-emac: Add A100 EMAC compatible")
  b3603c0466a8 ("dt-bindings: net: sun8i-emac: Rename A523 EMAC0 to GMAC0")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1  2 
Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml
MAINTAINERS
drivers/net/ethernet/airoha/airoha_eth.c
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/broadcom/genet/bcmgenet.c
drivers/net/ethernet/ti/am65-cpsw-nuss.c
drivers/net/phy/qcom/at803x.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/netlink/af_netlink.c
net/vmw_vsock/af_vsock.c

index 0ae415f1e69cea1d286b5a0eba85da5a38f7834b,19934d5c24e5fb27afedf2634b187f6d7940fa96..2ac709a4c472eb13ffe953882621265cd0ae6086
@@@ -21,10 -21,9 +21,10 @@@ properties
        - items:
            - enum:
                - allwinner,sun20i-d1-emac
 +              - allwinner,sun50i-a100-emac
                - allwinner,sun50i-h6-emac
                - allwinner,sun50i-h616-emac0
-               - allwinner,sun55i-a523-emac0
+               - allwinner,sun55i-a523-gmac0
            - const: allwinner,sun50i-a64-emac
  
    reg:
diff --cc MAINTAINERS
Simple merge
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge
Simple merge
Simple merge
Simple merge