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

include/net/sock.h
  commit 6c4bcc7b5b2e ("inet: fully convert sk->sk_rx_dst to RCU rules")
  commit 70c811c13ff9 ("net: move early demux fields close to sk_refcnt")
  https://lore.kernel.org/all/20211222141641.0caa0ab3@canb.auug.org.au/

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

diff --cc Documentation/networking/bonding.rst
Simple merge

diff --cc drivers/net/bonding/bond_options.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_base.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_txrx.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/prestera/prestera_main.c
Simple merge

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

diff --cc drivers/net/usb/r8152.c
Simple merge

diff --cc drivers/net/veth.c
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

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

diff --cc include/net/sock.h
index 37f878564d25bf4563bbbf507dddae12116af8aa,d47e9658da28545c1f6afd9db0cf136b3e13d7b6..44cc25f0bae750154a81881a79c9849754f417f1
--- 1/include/net/sock.h
--- 2/include/net/sock.h
+++ b/include/net/sock.h
@@@ -392,11 -391,6 +392,11 @@@ struct sock 
  #define sk_flags              __sk_common.skc_flags
  #define sk_rxhash             __sk_common.skc_rxhash
  
-       struct dst_entry        *sk_rx_dst;
 +      /* early demux fields */
++      struct dst_entry __rcu  *sk_rx_dst;
 +      int                     sk_rx_dst_ifindex;
 +      u32                     sk_rx_dst_cookie;
 +
        socket_lock_t           sk_lock;
        atomic_t                sk_drops;
        int                     sk_rcvlowat;

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

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

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

diff --cc net/ipv4/af_inet.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

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

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

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/netfilter/nf_conntrack_netlink.c
Simple merge

diff --cc net/netfilter/nfnetlink_queue.c
Simple merge

diff --cc net/sched/act_ct.c
Simple merge

diff --cc net/sched/cls_api.c
Simple merge

diff --cc net/sched/cls_flower.c
Simple merge

diff --cc net/tipc/crypto.c
Simple merge