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

Cross-merge networking fixes after downstream PR (net-7.3-rc7).

Conflicts:

include/net/strparser.h
  0984ebc631 ("strparser: make sure __strp_recv isn't running before tearing down the parser")
  02fd0a2111 ("net: strparser: removed the aborted bit and aborts counter")
https://lore.kernel.org/asYfmLsfy-SCxXjr@sirena.co.uk

Adjacent changes:

Documentation/networking/strparser.rst
  5f193cdabf ("docs: networking: strparser: remove general mode")
  0984ebc631 ("strparser: make sure __strp_recv isn't running before tearing down the parser")

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

2026-10-08 22:21:56 -07:00

..

af_packet.c

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

2026-10-08 22:21:56 -07:00

diag.c

net: change sock.sk_ino and sock_i_ino() to u64

2026-03-06 14:31:26 +01:00

internal.h

net/packet: avoid truncating TPACKET_V3 private size

2026-09-16 17:29:11 -07: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