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
..
asm	RISC-V Patches for the 6.12 Merge Window, Part 1	2024-09-24 10:59:17 -07:00
asm-generic	move asm/unaligned.h to linux/unaligned.h	2024-10-02 17:23:23 -04:00
generated	selftests: vDSO: don't include generated headers for chacha test	2024-09-13 17:28:36 +02:00
io_uring	selftests/net: Extract uring helpers to be reusable	2023-10-19 16:42:03 -06:00
linux	tools headers: Update the linux/unaligned.h copy with the kernel sources	2024-10-28 12:34:28 -03:00
nolibc	tools/nolibc: x86_64: use local label in memcpy/memmove	2024-08-16 17:23:13 +02:00
perf	KVM: selftests: aarch64: Update tools copy of arm_pmuv3.h	2023-12-12 09:46:22 +00:00
tools	tools include: add dis-asm-compat.h to handle version differences	2022-08-01 15:29:49 -03:00
trace/events	tools/lib/lockdep: Remove private kernel headers	2017-06-05 09:28:14 +02:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2024-10-31 18:10:07 -07:00
vdso	tools headers: Update the linux/unaligned.h copy with the kernel sources	2024-10-28 12:34:28 -03:00