Jakub Kicinski 385f186aba Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR (net-6.13-rc6).

No conflicts.

Adjacent changes:

include/linux/if_vlan.h
  f91a5b808938 ("af_packet: fix vlan_get_protocol_dgram() vs MSG_PEEK")
  3f330db30638 ("net: reformat kdoc return statements")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2025-01-03 16:29:29 -08:00

..

af_packet.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2025-01-03 16:29:29 -08:00

diag.c

net/packet: Add getsockopt support for PACKET_COPY_THRESH

2024-03-11 15:52:05 -07:00

internal.h

packet: Move reference count in packet_sock to atomic_long_t

2023-12-04 14:45:04 -08:00

Kconfig

treewide: replace '---help---' in Kconfig files with 'help'

2020-06-14 01:57:21 +09:00

Makefile

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00