]> 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>
Fri, 23 Jan 2026 04:13:25 +0000 (20:13 -0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 23 Jan 2026 04:14:36 +0000 (20:14 -0800)
commit9abf22075da98c615be2f608ec1167329a71eafd
tree8b2da9cc0b7f9410e3619223a679467d40391004
parent0b87bbf65d7d33754fd12df5984b9741e886dc69
parent0a80e38d0fe1fe7b59c1e93ad908c4148a15926a
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.19-rc7).

Conflicts:

drivers/net/ethernet/huawei/hinic3/hinic3_irq.c
  b35a6fd37a00 ("hinic3: Add adaptive IRQ coalescing with DIM")
  fb2bb2a1ebf7 ("hinic3: Fix netif_queue_set_napi queue_index input parameter error")
https://lore.kernel.org/fc0a7fdf08789a52653e8ad05281a0a849e79206.1768915707.git.zhuyikai1@h-partners.com

drivers/net/wireless/ath/ath12k/mac.c
drivers/net/wireless/ath/ath12k/wifi7/hw.c
  31707572108d ("wifi: ath12k: Fix wrong P2P device link id issue")
  c26f294fef2a ("wifi: ath12k: Move ieee80211_ops callback to the arch specific module")
https://lore.kernel.org/20260114123751.6a208818@canb.auug.org.au

Adjacent changes:

drivers/net/wireless/ath/ath12k/mac.c
  8b8d6ee53dfd ("wifi: ath12k: Fix scan state stuck in ABORTING after cancel_remain_on_channel")
  914c890d3b90 ("wifi: ath12k: Add framework for hardware specific ieee80211_ops registration")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
27 files changed:
CREDITS
MAINTAINERS
drivers/net/bonding/bond_main.c
drivers/net/ethernet/emulex/benet/be_cmds.c
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
drivers/net/ethernet/huawei/hinic3/hinic3_irq.c
drivers/net/ethernet/intel/ice/ice_common.c
drivers/net/ethernet/intel/ice/ice_lib.c
drivers/net/ethernet/intel/idpf/idpf_txrx.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/pcs/pcs-mtk-lynxi.c
drivers/net/wireless/ath/ath12k/ce.c
drivers/net/wireless/ath/ath12k/mac.c
drivers/net/wireless/ath/ath12k/wifi7/hw.c
drivers/net/wireless/ath/ath12k/wmi.c
drivers/net/wwan/mhi_wwan_mbim.c
include/net/cfg80211.h
include/uapi/linux/nl80211.h
net/core/skbuff.c
net/mac80211/ieee80211_i.h
net/mac80211/mlme.c
net/wireless/nl80211.c
net/wireless/util.c
tools/testing/selftests/net/Makefile
tools/testing/selftests/net/fib-onlink-tests.sh