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

Two cases of overlapping changes, nothing fancy.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/net/bpf_jit_comp32.c
Simple merge

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

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

diff --cc drivers/net/ethernet/allwinner/sun4i-emac.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/cadence/macb.h
Simple merge

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

diff --cc drivers/net/ethernet/ti/cpsw.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw_priv.h
Simple merge

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

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/trans.c
Simple merge

diff --cc drivers/net/wireless/marvell/mwifiex/scan.c
Simple merge

diff --cc drivers/net/wireless/marvell/mwifiex/wmm.c
Simple merge

diff --cc drivers/net/wireless/mediatek/mt76/mt76.h
Simple merge

diff --cc drivers/net/wireless/mediatek/mt76/usb.c
Simple merge

diff --cc include/linux/phylink.h
index 0fe57a261c9c7c566cfb2efceaf15b81a9e11173,5b130140fb8f3a8382d047718f8fcdf31e87439e..300ecdb6790a7ae8655e74bd43e6cf8e991c67fe
--- 1/include/linux/phylink.h
--- 2/include/linux/phylink.h
+++ b/include/linux/phylink.h
@@@ -114,9 -99,15 +115,15 @@@ struct phylink_mac_ops 
   * If the @state->interface mode is %PHY_INTERFACE_MODE_1000BASEX
   * or %PHY_INTERFACE_MODE_2500BASEX, select the appropriate mode
   * based on @state->advertising and/or @state->speed and update
-  * @state->interface accordingly.
+  * @state->interface accordingly. See phylink_helper_basex_speed().
+  *
+  * When @state->interface is %PHY_INTERFACE_MODE_NA, phylink expects the
+  * MAC driver to return all supported link modes.
+  *
+  * If the @state->interface mode is not supported, then the @supported
+  * mask must be cleared.
   */
 -void validate(struct net_device *ndev, unsigned long *supported,
 +void validate(struct phylink_config *config, unsigned long *supported,
              struct phylink_link_state *state);
  
  /**

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

diff --cc include/net/tls.h
index 0279938386aba2a6ebbd903887a57d56764ee56e,889df0312cd10d11b4c8353bbdfb05e294b57921..176d0b039f32c0e96f57208021370be760439a08
--- 1/include/net/tls.h
--- 2/include/net/tls.h
+++ b/include/net/tls.h
@@@ -345,8 -310,10 +345,9 @@@ struct tls_offload_context_rx 
  };
  
  #define TLS_OFFLOAD_CONTEXT_SIZE_RX                                   \
 -      (ALIGN(sizeof(struct tls_offload_context_rx), sizeof(void *)) + \
 -       TLS_DRIVER_STATE_SIZE)
 +      (sizeof(struct tls_offload_context_rx) + TLS_DRIVER_STATE_SIZE_RX)
  
+ void tls_ctx_free(struct tls_context *ctx);
  int wait_on_pending_writer(struct sock *sk, long *timeo);
  int tls_sk_query(struct sock *sk, int optname, char __user *optval,
                int __user *optlen);

diff --cc include/net/xdp_sock.h
index de4e3a353df344ffd42f88560b2dd4a8722b16ce,7da155164947d0dafc247fe4d16d2f6a294e0c6f..69796d264f0638457526345f5cc423bf2c27bf17
--- 1/include/net/xdp_sock.h
--- 2/include/net/xdp_sock.h
+++ b/include/net/xdp_sock.h
@@@ -58,11 -58,16 +58,16 @@@ struct xdp_sock 
        struct xdp_umem *umem;
        struct list_head flush_node;
        u16 queue_id;
 -      struct xsk_queue *tx ____cacheline_aligned_in_smp;
 -      struct list_head list;
        bool zc;
+       enum {
+               XSK_READY = 0,
+               XSK_BOUND,
+               XSK_UNBOUND,
+       } state;
        /* Protects multiple processes in the control path */
        struct mutex mutex;
 +      struct xsk_queue *tx ____cacheline_aligned_in_smp;
 +      struct list_head list;
        /* Mutual exclusion of NAPI TX thread and sendmsg error paths
         * in the SKB destructor callback.
         */

diff --cc include/uapi/linux/bpf.h
Simple merge

diff --cc include/uapi/linux/nl80211.h
Simple merge

diff --cc kernel/bpf/core.c
Simple merge

diff --cc net/batman-adv/hard-interface.c
Simple merge

diff --cc net/batman-adv/types.h
Simple merge

diff --cc net/bridge/br_input.c
Simple merge

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

diff --cc net/ipv4/devinet.c
index 137d1892395d3e9f9bb26ed532484b9737aaab8f,c5ebfa199794cd9585a0162f2dd47c6b16412cb3..a4b5bd4d2c89e0ce9574199a467d53ee8504876c
--- 1/net/ipv4/devinet.c
--- 2/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@@ -482,10 -473,11 +487,13 @@@ static int __inet_insert_ifa(struct in_
        ifa->ifa_flags &= ~IFA_F_SECONDARY;
        last_primary = &in_dev->ifa_list;
  
 -      for (ifap = &in_dev->ifa_list; (ifa1 = *ifap) != NULL;
 -           ifap = &ifa1->ifa_next) {
+       /* Don't set IPv6 only flags to IPv4 addresses */
+       ifa->ifa_flags &= ~IPV6ONLY_FLAGS;
+ 
 +      ifap = &in_dev->ifa_list;
 +      ifa1 = rtnl_dereference(*ifap);
 +
 +      while (ifa1) {
                if (!(ifa1->ifa_flags & IFA_F_SECONDARY) &&
                    ifa->ifa_scope <= ifa1->ifa_scope)
                        last_primary = &ifa1->ifa_next;

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

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

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

diff --cc net/key/af_key.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_core.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
Simple merge

diff --cc net/netfilter/nf_nat_proto.c
index 888292e8fbb24f7790da01536dfb1e2d16b0b54a,83a24cc5753bcf94c58498f5d1df8349a75414b3..7ac733ebd060d4acf6ed56972d978a23d02d722b
--- 1/net/netfilter/nf_nat_proto.c
--- 2/net/netfilter/nf_nat_proto.c
+++ b/net/netfilter/nf_nat_proto.c
@@@ -562,9 -562,9 +562,9 @@@ int nf_nat_icmp_reply_translation(struc
  
        WARN_ON(ctinfo != IP_CT_RELATED && ctinfo != IP_CT_RELATED_REPLY);
  
 -      if (!skb_make_writable(skb, hdrlen + sizeof(*inside)))
 +      if (skb_ensure_writable(skb, hdrlen + sizeof(*inside)))
                return 0;
-       if (nf_ip_checksum(skb, hooknum, hdrlen, 0))
+       if (nf_ip_checksum(skb, hooknum, hdrlen, IPPROTO_ICMP))
                return 0;
  
        inside = (void *)skb->data + hdrlen;

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

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

diff --cc net/tls/tls_device.c
Simple merge

diff --cc net/tls/tls_sw.c
Simple merge

diff --cc net/xdp/xsk.c
index 0574f008954c1f76ed290120831af99e64713a74,f53a6ef7c155de864f46361fe01c909ba793eb1e..d4d6f10aa93646d280c23eb6f28b89582cbb922f
--- 1/net/xdp/xsk.c
--- 2/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@@ -798,8 -817,8 +851,9 @@@ static int xsk_create(struct net *net, 
        sock_set_flag(sk, SOCK_RCU_FREE);
  
        xs = xdp_sk(sk);
+       xs->state = XSK_READY;
        mutex_init(&xs->mutex);
 +      spin_lock_init(&xs->rx_lock);
        spin_lock_init(&xs->tx_completion_lock);
  
        mutex_lock(&net->xdp.lock);

diff --cc net/xdp/xsk_queue.h
Simple merge

diff --cc net/xfrm/xfrm_interface.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge

diff --cc samples/bpf/xdp_redirect_user.c
Simple merge

diff --cc tools/bpf/bpftool/cgroup.c
Simple merge

diff --cc tools/include/uapi/linux/bpf.h
Simple merge

diff --cc tools/testing/selftests/bpf/progs/test_lwt_seg6local.c
Simple merge

diff --cc tools/testing/selftests/net/config
index e4b878d95ba01f96a1bbf9cc7a2b15f597fba5db,3dea2cba232527d5fd0164ce3e9761a740130440..b8503a8119b070a27f22b2eada4d890b119e8d8a
--- 1/tools/testing/selftests/net/config
--- 2/tools/testing/selftests/net/config
+++ b/tools/testing/selftests/net/config
@@@ -25,6 -25,4 +25,7 @@@ CONFIG_NF_TABLES_IPV6=
  CONFIG_NF_TABLES_IPV4=y
  CONFIG_NFT_CHAIN_NAT_IPV6=m
  CONFIG_NFT_CHAIN_NAT_IPV4=m
 +CONFIG_NET_SCH_FQ=m
 +CONFIG_NET_SCH_ETF=m
 +CONFIG_TEST_BLACKHOLE_DEV=m
+ CONFIG_KALLSYMS=y

diff --cc tools/testing/selftests/tc-testing/tc-tests/filters/tests.json
Simple merge