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:Jakub Kicinski <kuba@kernel.org>
Loading
Please sign in to comment