mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 14:53:58 -04:00
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.c9222582ec5("Revert "wifi: ath12k: Fix missing station power save configuration"")6917e268c4("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/Kconfigb1d16f7c00("libie: depend on DEBUG_FS when building LIBIE_FWLOG")93f53db9f9("ice: switch to Page Pool") Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
@@ -19,4 +19,8 @@ TEST_PROGS := \
|
||||
udp_tunnel_nic.sh \
|
||||
# end of TEST_PROGS
|
||||
|
||||
TEST_FILES := \
|
||||
ethtool-common.sh
|
||||
# end of TEST_FILES
|
||||
|
||||
include ../../../lib.mk
|
||||
|
||||
Reference in New Issue
Block a user