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>

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
Simple merge

diff --cc include/linux/if_vlan.h
index d6326b53e3364c4982cad4eb8fe59fa7bbf75d84,d65b5d71b93bf8e051d361ab4abc78d2a48d7904..d495cbdb52cb093b87f72711623aa4b4abbc65f1
--- 1/include/linux/if_vlan.h
--- 2/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@@ -585,13 -585,16 +585,16 @@@ static inline int vlan_get_tag(const st
   * vlan_get_protocol - get protocol EtherType.
   * @skb: skbuff to query
   * @type: first vlan protocol
+  * @mac_offset: MAC offset
   * @depth: buffer to store length of eth and vlan tags in bytes
   *
 - * Returns the EtherType of the packet, regardless of whether it is
 + * Returns: the EtherType of the packet, regardless of whether it is
   * vlan encapsulated (normal or hardware accelerated) or not.
   */
- static inline __be16 __vlan_get_protocol(const struct sk_buff *skb, __be16 type,
-                                        int *depth)
+ static inline __be16 __vlan_get_protocol_offset(const struct sk_buff *skb,
+                                               __be16 type,
+                                               int mac_offset,
+                                               int *depth)
  {
        unsigned int vlan_depth = skb->mac_len, parse_depth = VLAN_MAX_DEPTH;
  

diff --cc include/linux/mlx5/mlx5_ifc.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/filter.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge