]> Gentwo Git Trees - linux/.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 12 Sep 2025 00:37:09 +0000 (17:37 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 25 Sep 2025 18:00:59 +0000 (11:00 -0700)
commit203e3beb73e53584ca90bc2a6d8240b9b12b9bcf
treed07988b5c8599d876a326da1c916f62f1249b01c
parent12de5f0f6c2d7aad7e60aada650fcfb374c28a5e
parent4ff71af020ae59ae2d83b174646fc2ad9fcd4dc4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.17-rc8).

Conflicts:

drivers/net/can/spi/hi311x.c
  6b6968084721 ("can: hi311x: fix null pointer dereference when resuming from sleep before interface was enabled")
  27ce71e1ce81 ("net: WQ_PERCPU added to alloc_workqueue users")
https://lore.kernel.org/72ce7599-1b5b-464a-a5de-228ff9724701@kernel.org

net/smc/smc_loopback.c
drivers/dibs/dibs_loopback.c
  a35c04de2565 ("net/smc: fix warning in smc_rx_splice() when calling get_page()")
  cc21191b584c ("dibs: Move data path to dibs layer")
https://lore.kernel.org/74368a5c-48ac-4f8e-a198-40ec1ed3cf5f@kernel.org

Adjacent changes:

drivers/net/dsa/lantiq/lantiq_gswip.c
  c0054b25e2f1 ("net: dsa: lantiq_gswip: move gswip_add_single_port_br() call to port_setup()")
  7a1eaef0a791 ("net: dsa: lantiq_gswip: support model-specific mac_select_pcs()")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
12 files changed:
MAINTAINERS
drivers/dibs/dibs_loopback.c
drivers/net/can/spi/hi311x.c
drivers/net/dsa/lantiq/lantiq_gswip.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/marvell/octeontx2/af/cgx.c
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
drivers/net/tun.c
include/uapi/linux/ptp_clock.h
net/core/skbuff.c
net/ipv4/nexthop.c