Jakub Kicinski 2483e7f04c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/stmicro/stmmac/dwmac5.c drivers/net/ethernet/stmicro/stmmac/dwmac5.h drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c drivers/net/ethernet/stmicro/stmmac/hwif.h 37e4b8df27 ("net: stmmac: fix FPE events losing") c3f3b97238 ("net: stmmac: Refactor EST implementation") https://lore.kernel.org/all/20231206110306.01e91114@canb.auug.org.au/ Adjacent changes: net/ipv4/tcp_ao.c 9396c4ee93 ("net/tcp: Don't store TCP-AO maclen on reqsk") 7b0f570f87 ("tcp: Move TCP-AO bits from cookie_v[46]_check() to tcp_ao_syncookie().") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2023-12-07 17:53:17 -08:00
..
asm	tools headers: Update the copy of x86's mem{cpy,set}_64.S used in 'perf bench'	2023-05-17 10:42:19 -03:00
asm-generic	tools: Disable __packed attribute compiler warning due to -Werror=attributes	2023-11-22 12:23:27 -08:00
io_uring	selftests/net: Extract uring helpers to be reusable	2023-10-19 16:42:03 -06:00
linux	As usual, lots of singleton and doubleton patches all over the tree and	2023-11-02 20:53:31 -10:00
nolibc	tools/nolibc: add support for constructors and destructors	2023-10-12 21:14:16 +02:00
perf	tools: Import arm_pmuv3.h	2023-10-24 22:59:30 +00:00
tools	tools include: add dis-asm-compat.h to handle version differences	2022-08-01 15:29:49 -03:00
trace/events
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-12-07 17:53:17 -08:00
vdso	tools headers: Synchronize {linux,vdso}/bits.h with the kernel sources	2023-03-03 22:34:15 -03:00