Jakub Kicinski e19de2064f Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/ti/icssg/icssg_classifier.c abd5576b9c ("net: ti: icssg-prueth: Add support for ICSSG switch firmware") 56a5cf538c ("net: ti: icssg-prueth: Fix start counter for ft1 filter") https://lore.kernel.org/all/20240531123822.3bb7eadf@canb.auug.org.au/ No other adjacent changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2024-05-31 14:10:28 -07: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: Synchronize linux/bits.h with the kernel sources	2024-04-26 22:13:10 -03:00
drm	tools/include: Sync uapi/drm/i915_drm.h with the kernel sources	2024-04-11 10:35:32 -07:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2024-05-31 14:10:28 -07:00