]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 6 Nov 2025 17:25:16 +0000 (09:25 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 6 Nov 2025 17:27:40 +0000 (09:27 -0800)
commit1ec9871fbb80ba7db84f868f6aa40d38bc43f0e0
tree5b51296797c4e6d4cfa1707d3cacf2704efa2de4
parent13068e9d57264d0a86b8195817a01155ba33d230
parentc2c2ccfd4ba72718266a56f3ecc34c989cb5b7a0
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.18-rc5).

Conflicts:

drivers/net/wireless/ath/ath12k/mac.c
  9222582ec524 ("Revert "wifi: ath12k: Fix missing station power save configuration"")
  6917e268c433 ("wifi: ath12k: Defer vdev bring-up until CSA finalize to avoid stale beacon")
https://lore.kernel.org/11cece9f7e36c12efd732baa5718239b1bf8c950.camel@sipsolutions.net

Adjacent changes:

drivers/net/ethernet/intel/Kconfig
  b1d16f7c0063 ("libie: depend on DEBUG_FS when building LIBIE_FWLOG")
  93f53db9f9dc ("ice: switch to Page Pool")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
25 files changed:
MAINTAINERS
drivers/net/dsa/b53/b53_common.c
drivers/net/dsa/b53/b53_regs.h
drivers/net/dsa/microchip/ksz9477.c
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c
drivers/net/ethernet/intel/Kconfig
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
drivers/net/ethernet/ti/netcp_core.c
drivers/net/ethernet/wangxun/libwx/wx_hw.c
drivers/net/ethernet/wangxun/libwx/wx_type.h
drivers/net/phy/micrel.c
drivers/net/virtio_net.c
drivers/net/wireless/ath/ath12k/mac.c
drivers/net/wireless/virtual/mac80211_hwsim.c
fs/smb/client/connect.c
include/net/cfg80211.h
net/bridge/br_if.c
net/core/filter.c
net/mac80211/mlme.c
net/wireless/core.c
tools/testing/selftests/drivers/net/netdevsim/Makefile