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

Merge in the left-over fixes before the net-next pull-request.

net/mptcp/subflow.c
  d3295fee3c75 ("mptcp: use proper req destructor for IPv6")
  36b122baf6a8 ("mptcp: add subflow_v(4,6)_send_synack()")

Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

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

diff --cc net/dsa/tag_8021q.c
Simple merge

diff --cc net/ipv6/datagram.c
Simple merge

diff --cc net/mptcp/pm_userspace.c
Simple merge

diff --cc net/mptcp/subflow.c
index 2990430,613f515..d1d32a6
--- 1/net/mptcp/subflow.c
--- 2/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@@ -1998,9 -1965,22 +2025,23 @@@ void __init mptcp_subflow_init(void
        tcp_prot_override.release_cb = tcp_release_cb_override;
  
  #if IS_ENABLED(CONFIG_MPTCP_IPV6)
+       /* In struct mptcp_subflow_request_sock, we assume the TCP request sock
+        * structures for v4 and v6 have the same size. It should not changed in
+        * the future but better to make sure to be warned if it is no longer
+        * the case.
+        */
+       BUILD_BUG_ON(sizeof(struct tcp_request_sock) != sizeof(struct tcp6_request_sock));
+ 
+       mptcp_subflow_v6_request_sock_ops = tcp6_request_sock_ops;
+       mptcp_subflow_v6_request_sock_ops.slab_name = "request_sock_subflow_v6";
+       mptcp_subflow_v6_request_sock_ops.destructor = subflow_v6_req_destructor;
+ 
+       if (subflow_ops_init(&mptcp_subflow_v6_request_sock_ops) != 0)
+               panic("MPTCP: failed to init subflow v6 request sock ops\n");
+ 
        subflow_request_sock_ipv6_ops = tcp_request_sock_ipv6_ops;
        subflow_request_sock_ipv6_ops.route_req = subflow_v6_route_req;
 +      subflow_request_sock_ipv6_ops.send_synack = subflow_v6_send_synack;
  
        subflow_v6_specific = ipv6_specific;
        subflow_v6_specific.conn_request = subflow_v6_conn_request;