Commit 385f186a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files


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

No conflicts.

Adjacent changes:

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

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3fff5da4 aba74e63
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment