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	asm-generic: Unify uapi bitsperlong.h for arm64, riscv and loongarch	2023-06-22 17:04:36 +02:00
asm-generic	tools headers UAPI: Update tools's copy of unistd.h header	2023-11-22 10:57:46 -08:00
drm	tools headers UAPI: Update tools's copy of drm headers	2023-11-22 10:57:46 -08:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-12-07 17:53:17 -08:00
sound	tools include UAPI: Sync the sound/asound.h copy with the kernel sources	2023-07-14 10:33:50 -03:00