Jakub Kicinski 51b35d4f9d Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Merge in late fixes to prepare for the 6.11 net-next PR. Conflicts: 93c3a96c30 ("net: pse-pd: Do not return EOPNOSUPP if config is null") 4cddb0f15e ("net: ethtool: pse-pd: Fix possible null-deref") 30d7b67277 ("net: ethtool: Add new power limit get and set features") https://lore.kernel.org/20240715123204.623520bb@canb.auug.org.au/ Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2024-07-15 13:19:17 -07:00
..
af_packet.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2024-07-15 13:19:17 -07:00
diag.c	net/packet: Add getsockopt support for PACKET_COPY_THRESH	2024-03-11 15:52:05 -07:00
internal.h
Kconfig
Makefile