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

No conflicts.

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/net/dsa/Kconfig
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

diff --cc drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
Simple merge

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

diff --cc drivers/net/ethernet/mscc/ocelot.c
Simple merge

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

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
Simple merge

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

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

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

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

diff --cc include/net/netns/ipv6.h
Simple merge

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

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

diff --cc net/dsa/dsa_priv.h
Simple merge

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

diff --cc net/ipv4/fib_lookup.h
Simple merge

diff --cc net/ipv4/fib_semantics.c
index c9c4f2f66b38b2b642e6cb7b7c2f28e5029e5c89,2dd375f7407b68b0ddd914237185671550d19b72..c5a29703185a3f0748ecc8095e7aeb307d473c8b
--- 1/net/ipv4/fib_semantics.c
--- 2/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@@ -524,11 -523,11 +524,11 @@@ void rtmsg_fib(int event, __be32 key, s
        fri.tb_id = tb_id;
        fri.dst = key;
        fri.dst_len = dst_len;
 -      fri.tos = fa->fa_tos;
 +      fri.tos = inet_dscp_to_dsfield(fa->fa_dscp);
        fri.type = fa->fa_type;
-       fri.offload = fa->offload;
-       fri.trap = fa->trap;
-       fri.offload_failed = fa->offload_failed;
+       fri.offload = READ_ONCE(fa->offload);
+       fri.trap = READ_ONCE(fa->trap);
+       fri.offload_failed = READ_ONCE(fa->offload_failed);
        err = fib_dump_info(skb, info->portid, seq, event, &fri, nlm_flags);
        if (err < 0) {
                /* -EMSGSIZE implies BUG in fib_nlmsg_size() */

diff --cc net/ipv4/fib_trie.c
index c05cd105e95ed571802d464ffe7ac23507c04e97,f7f74d5c14da663e067f4d09a620b263947bd2da..2af2b99e0bea9420f7fd529f221fcd383db89fc1
--- 1/net/ipv4/fib_trie.c
--- 2/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@@ -2304,11 -2299,11 +2308,11 @@@ static int fn_trie_dump_leaf(struct key
                                fri.tb_id = tb->tb_id;
                                fri.dst = xkey;
                                fri.dst_len = KEYLENGTH - fa->fa_slen;
 -                              fri.tos = fa->fa_tos;
 +                              fri.tos = inet_dscp_to_dsfield(fa->fa_dscp);
                                fri.type = fa->fa_type;
-                               fri.offload = fa->offload;
-                               fri.trap = fa->trap;
-                               fri.offload_failed = fa->offload_failed;
+                               fri.offload = READ_ONCE(fa->offload);
+                               fri.trap = READ_ONCE(fa->trap);
+                               fri.offload_failed = READ_ONCE(fa->offload_failed);
                                err = fib_dump_info(skb,
                                                    NETLINK_CB(cb->skb).portid,
                                                    cb->nlh->nlmsg_seq,

diff --cc net/ipv4/route.c
index 202d6b1fff43fb095427720ec36fe3744aeb7149,f33ad1f383b684ea4a64d74da0a9951651a4be22..f444f5983405cb0a8294b0577174a4dcaa26c7ae
--- 1/net/ipv4/route.c
--- 2/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@@ -3397,11 -3392,11 +3397,11 @@@ static int inet_rtm_getroute(struct sk_
  
                                if (fa->fa_slen == slen &&
                                    fa->tb_id == fri.tb_id &&
 -                                  fa->fa_tos == fri.tos &&
 +                                  fa->fa_dscp == inet_dsfield_to_dscp(fri.tos) &&
                                    fa->fa_info == res.fi &&
                                    fa->fa_type == fri.type) {
-                                       fri.offload = fa->offload;
-                                       fri.trap = fa->trap;
+                                       fri.offload = READ_ONCE(fa->offload);
+                                       fri.trap = READ_ONCE(fa->trap);
                                        break;
                                }
                        }

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

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

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

diff --cc net/mctp/route.c
Simple merge

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

diff --cc net/smc/af_smc.c
Simple merge

diff --cc tools/perf/util/bpf-loader.c
Simple merge