Jakub Kicinski 5b1c965956 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR (net-6.12-rc6). Conflicts: drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c cbe84e9ad5 ("wifi: iwlwifi: mvm: really send iwl_txpower_constraints_cmd") 188a1bf894 ("wifi: mac80211: re-order assigning channel in activate links") https://lore.kernel.org/all/20241028123621.7bbb131b@canb.auug.org.au/ net/mac80211/cfg.c c4382d5ca1 ("wifi: mac80211: update the right link for tx power") 8dd0498983 ("wifi: mac80211: Fix setting txpower with emulate_chanctx") drivers/net/ethernet/intel/ice/ice_ptp_hw.h 6e58c33106 ("ice: fix crash on probe for DPLL enabled E810 LOM") e4291b64e1 ("ice: Align E810T GPIO to other products") ebb2693f8f ("ice: Read SDP section from NVM for pin definitions") ac532f4f42 ("ice: Cleanup unused declarations") https://lore.kernel.org/all/20241030120524.1ee1af18@canb.auug.org.au/ No adjacent changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2024-10-31 18:10:07 -07:00
..
Makefile	netdevsim: add dummy macsec offload	2023-07-14 09:16:53 +01:00
bpf.c	netdevsim: Don't accept device bound programs	2023-11-23 13:04:04 -08:00
bus.c	netdevsim: allow two netdevsim ports to be connected	2024-03-01 10:43:10 +00:00
dev.c	netdevsim: use cond_resched() in nsim_dev_trap_report_work()	2024-10-15 09:58:43 -07:00
ethtool.c	testing: net-drv: add basic shaper test	2024-10-10 08:30:23 -07:00
fib.c	netdevsim: Add trailing zero to terminate the string in nsim_nexthop_bucket_activity_write()	2024-10-29 11:43:01 -07:00
health.c	netdevsim: devlink health: use retained error fmsg API	2023-10-20 11:34:49 +01:00
hwstats.c	netdevsim: Fix hwstats debugfs file permissions	2022-09-19 14:40:38 -07:00
ipsec.c	netdevsim: copy addresses for both in and out paths	2024-10-11 15:44:27 -07:00
macsec.c	netdevsim: macsec: pad u64 to correct length in logs	2024-10-23 09:51:06 +02:00
netdev.c	testing: net-drv: add basic shaper test	2024-10-10 08:30:23 -07:00
netdevsim.h	netdevsim: add NAPI support	2024-05-08 18:59:47 -07:00
psample.c	…
udp_tunnels.c	…