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

Honestly all the conflicts were simple overlapping changes,
nothing really interesting to report.

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

diff --cc Documentation/networking/ip-sysctl.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/net/bpf_jit_32.c
Simple merge

diff --cc arch/powerpc/net/bpf_jit_comp64.c
Simple merge

diff --cc arch/riscv/net/bpf_jit_comp.c
Simple merge

diff --cc drivers/net/dsa/microchip/ksz_common.c
Simple merge

diff --cc drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c
Simple merge

diff --cc drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h
Simple merge

diff --cc drivers/net/ethernet/huawei/hinic/hinic_hw_io.c
Simple merge

diff --cc drivers/net/ethernet/huawei/hinic/hinic_hw_qp_ctxt.h
Simple merge

diff --cc drivers/net/ethernet/huawei/hinic/hinic_hw_wqe.h
Simple merge

diff --cc drivers/net/ethernet/huawei/hinic/hinic_main.c
Simple merge

diff --cc drivers/net/ethernet/huawei/hinic/hinic_port.c
Simple merge

diff --cc drivers/net/ethernet/huawei/hinic/hinic_port.h
Simple merge

diff --cc drivers/net/ethernet/huawei/hinic/hinic_rx.c
Simple merge

diff --cc drivers/net/ethernet/huawei/hinic/hinic_rx.h
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index 30f7dffb5b1b805cae792900bd7a3c75bb9a05ab,e94686c420004c2bd44417fd21b2f8d67a5e69b5..8cdd7e66f8df5b69d75fe18cb5aafb8a0b1dc436
--- 1/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@@ -628,7 -632,11 +632,11 @@@ const char *mlx5_command_str(int comman
        MLX5_COMMAND_STR_CASE(QUERY_MODIFY_HEADER_CONTEXT);
        MLX5_COMMAND_STR_CASE(ALLOC_MEMIC);
        MLX5_COMMAND_STR_CASE(DEALLOC_MEMIC);
 -      MLX5_COMMAND_STR_CASE(QUERY_HOST_PARAMS);
 +      MLX5_COMMAND_STR_CASE(QUERY_ESW_FUNCTIONS);
+       MLX5_COMMAND_STR_CASE(CREATE_UCTX);
+       MLX5_COMMAND_STR_CASE(DESTROY_UCTX);
+       MLX5_COMMAND_STR_CASE(CREATE_UMEM);
+       MLX5_COMMAND_STR_CASE(DESTROY_UMEM);
        default: return "unknown command opcode";
        }
  }

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en.h
Simple merge

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

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

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

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

diff --cc drivers/net/ethernet/mellanox/mlxsw/reg.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/nfp_net_common.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_debug.c
Simple merge

diff --cc drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/common.h
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
Simple merge

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

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

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac4.h
Simple merge

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

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

diff --cc drivers/net/ethernet/stmicro/stmmac/mmc.h
Simple merge

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

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

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

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

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

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

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

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

diff --cc drivers/net/phy/Makefile
Simple merge

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

diff --cc drivers/net/wireless/intel/iwlegacy/3945-rs.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlegacy/4965-rs.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/dvm/rs.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/rs.c
Simple merge

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc drivers/scsi/qedf/qedf_main.c
Simple merge

diff --cc drivers/scsi/qedi/qedi_main.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

diff --cc include/uapi/linux/snmp.h
index 74904e9d1b726f5089bdfb2f6d1280fa991a27a7,fd42c1316d3d112ecd8a00d2b499d6f6901c5e81..549a31c29f7d4ebbc3a861244e9757c3ebbc2d0d
--- 1/include/uapi/linux/snmp.h
--- 2/include/uapi/linux/snmp.h
+++ b/include/uapi/linux/snmp.h
@@@ -283,7 -283,7 +283,8 @@@ enu
        LINUX_MIB_TCPACKCOMPRESSED,             /* TCPAckCompressed */
        LINUX_MIB_TCPZEROWINDOWDROP,            /* TCPZeroWindowDrop */
        LINUX_MIB_TCPRCVQDROP,                  /* TCPRcvQDrop */
+       LINUX_MIB_TCPWQUEUETOOBIG,              /* TCPWqueueTooBig */
 +      LINUX_MIB_TCPFASTOPENPASSIVEALTKEY,     /* TCPFastOpenPassiveAltKey */
        __LINUX_MIB_MAX
  };
  

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

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

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

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

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

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

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

diff --cc kernel/bpf/verifier.c
index 5c2cb5bd84ce551bae49e57fd111ecc102f79024,a5c369e60343d4239285078410cb6d5b470ff48c..1e9d10b32984139ee906163248f0b86024501e02
--- 1/kernel/bpf/verifier.c
--- 2/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@@ -5513,13 -5353,12 +5505,16 @@@ static int check_return_code(struct bpf
        struct tnum range = tnum_range(0, 1);
  
        switch (env->prog->type) {
+       case BPF_PROG_TYPE_CGROUP_SOCK_ADDR:
+               if (env->prog->expected_attach_type == BPF_CGROUP_UDP4_RECVMSG ||
+                   env->prog->expected_attach_type == BPF_CGROUP_UDP6_RECVMSG)
+                       range = tnum_range(1, 1);
        case BPF_PROG_TYPE_CGROUP_SKB:
 +              if (env->prog->expected_attach_type == BPF_CGROUP_INET_EGRESS) {
 +                      range = tnum_range(0, 3);
 +                      enforce_attach_type_range = tnum_range(2, 3);
 +              }
        case BPF_PROG_TYPE_CGROUP_SOCK:
-       case BPF_PROG_TYPE_CGROUP_SOCK_ADDR:
        case BPF_PROG_TYPE_SOCK_OPS:
        case BPF_PROG_TYPE_CGROUP_DEVICE:
        case BPF_PROG_TYPE_CGROUP_SYSCTL:
@@@ -5546,13 -5385,9 +5541,13 @@@
                        verbose(env, "has unknown scalar value");
                }
                tnum_strn(tn_buf, sizeof(tn_buf), range);
-               verbose(env, " should have been %s\n", tn_buf);
+               verbose(env, " should have been in %s\n", tn_buf);
                return -EINVAL;
        }
 +
 +      if (!tnum_is_unknown(enforce_attach_type_range) &&
 +          tnum_in(enforce_attach_type_range, reg->var_off))
 +              env->prog->enforce_expected_attach_type = 1;
        return 0;
  }
  

diff --cc kernel/cgroup/cgroup.c
Simple merge

diff --cc kernel/trace/bpf_trace.c
Simple merge

diff --cc net/core/bpf_sk_storage.c
index f40e3d35fd9c2f88e6ced6bc0992c276f177d29c,d1c4e1f3be2c71385e5c4414b8c831e4b2e4a91d..94c7f77ecb6b66b388dcc23c151d487e614196d1
--- 1/net/core/bpf_sk_storage.c
--- 2/net/core/bpf_sk_storage.c
+++ b/net/core/bpf_sk_storage.c
@@@ -634,16 -633,9 +634,17 @@@ static struct bpf_map *bpf_sk_storage_m
                return ERR_PTR(-ENOMEM);
        bpf_map_init_from_attr(&smap->map, attr);
  
-       smap->bucket_log = ilog2(roundup_pow_of_two(num_possible_cpus()));
+       /* Use at least 2 buckets, select_bucket() is undefined behavior with 1 bucket */
+       smap->bucket_log = max_t(u32, 1, ilog2(roundup_pow_of_two(num_possible_cpus())));
        nbuckets = 1U << smap->bucket_log;
 +      cost = sizeof(*smap->buckets) * nbuckets + sizeof(*smap);
 +
 +      ret = bpf_map_charge_init(&smap->map.memory, cost);
 +      if (ret < 0) {
 +              kfree(smap);
 +              return ERR_PTR(ret);
 +      }
 +
        smap->buckets = kvcalloc(sizeof(*smap->buckets), nbuckets,
                                 GFP_USER | __GFP_NOWARN);
        if (!smap->buckets) {

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

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

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

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

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

diff --cc net/ipv4/proc.c
index 80d2ba1b6299ac095f9fffb020bf8103e3bb10ee,073273b751f8fcda1c9c79cd1ab566f2939b2517..cc90243ccf767807cad7fa47ba808df75554fd5e
--- 1/net/ipv4/proc.c
--- 2/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@@ -287,7 -287,7 +287,8 @@@ static const struct snmp_mib snmp4_net_
        SNMP_MIB_ITEM("TCPAckCompressed", LINUX_MIB_TCPACKCOMPRESSED),
        SNMP_MIB_ITEM("TCPZeroWindowDrop", LINUX_MIB_TCPZEROWINDOWDROP),
        SNMP_MIB_ITEM("TCPRcvQDrop", LINUX_MIB_TCPRCVQDROP),
+       SNMP_MIB_ITEM("TCPWqueueTooBig", LINUX_MIB_TCPWQUEUETOOBIG),
 +      SNMP_MIB_ITEM("TCPFastOpenPassiveAltKey", LINUX_MIB_TCPFASTOPENPASSIVEALTKEY),
        SNMP_MIB_SENTINEL
  };
  

diff --cc net/ipv4/sysctl_net_ipv4.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/tcp_output.c
Simple merge

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

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

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

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

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

diff --cc net/lapb/lapb_iface.c
Simple merge

diff --cc net/mac80211/cfg.c
index fcf1dfc3a1cc6e4344aa96d494cac5a515ceba6d,a1973a26c7fc458f74946b48e75385dffcba4be4..4f12d042c89c54b56862318cd4ba01ebd48cef4b
--- 1/net/mac80211/cfg.c
--- 2/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@@ -4,9 -5,7 +5,8 @@@
   * Copyright 2006-2010        Johannes Berg <johannes@sipsolutions.net>
   * Copyright 2013-2015  Intel Mobile Communications GmbH
   * Copyright (C) 2015-2017 Intel Deutschland GmbH
-  *
-  * This file is GPLv2 as found in COPYING.
 + * Copyright (C) 2018-2019 Intel Corporation
+  * Copyright (C) 2018 Intel Corporation
   */
  
  #include <linux/ieee80211.h>

diff --cc net/mac80211/key.c
index faadfeea7127dcaac956584f331c04f242b2e6d4,89f09a09efdb7c6a3bd13bf91f1e82c9186e766e..49f86f412564757afe36c998a07f741f889ac942
--- 1/net/mac80211/key.c
--- 2/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@@ -271,12 -271,7 +271,10 @@@ int ieee80211_set_tx_key(struct ieee802
  
        assert_key_lock(local);
  
-       old = key_mtx_dereference(local, sta->ptk[sta->ptk_idx]);
        sta->ptk_idx = key->conf.keyidx;
 +
 +      if (ieee80211_hw_check(&local->hw, NO_AMPDU_KEYBORDER_SUPPORT))
 +              clear_sta_flag(sta, WLAN_STA_BLOCK_BA);
        ieee80211_check_fast_xmit(sta);
  
        return 0;

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

diff --cc net/openvswitch/datapath.c
Simple merge

diff --cc net/openvswitch/vport.c
Simple merge

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

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

diff --cc net/vmw_vsock/af_vsock.c
Simple merge

diff --cc net/vmw_vsock/hyperv_transport.c
Simple merge

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

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc net/wireless/scan.c
Simple merge

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

diff --cc tools/bpf/bpftool/Documentation/bpftool-cgroup.rst
Simple merge

diff --cc tools/bpf/bpftool/Documentation/bpftool-prog.rst
Simple merge

diff --cc tools/bpf/bpftool/bash-completion/bpftool
Simple merge

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

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

diff --cc tools/lib/bpf/libbpf.c
Simple merge

diff --cc tools/lib/bpf/libbpf_internal.h
Simple merge

diff --cc tools/testing/selftests/bpf/Makefile
index 2b426ae1cdc9e9ade4b7274d24e80a839afc3f93,e36356e2377e9624b23002a8ab6e9786b2a7c518..d8df5c9b5b2fff6b42c317c2347e11c670e0653e
--- 1/tools/testing/selftests/bpf/Makefile
--- 2/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@@ -23,10 -21,9 +23,10 @@@ LDLIBS += -lcap -lelf -lrt -lpthrea
  # Order correspond to 'make run_tests' order
  TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test_progs \
        test_align test_verifier_log test_dev_cgroup test_tcpbpf_user \
-       test_sock test_btf test_sockmap test_lirc_mode2_user get_cgroup_id_user \
-       test_socket_cookie test_cgroup_storage test_select_reuseport test_section_names \
+       test_sock test_btf test_sockmap get_cgroup_id_user test_socket_cookie \
+       test_cgroup_storage test_select_reuseport test_section_names \
 -      test_netcnt test_tcpnotify_user test_sock_fields test_sysctl
 +      test_netcnt test_tcpnotify_user test_sock_fields test_sysctl test_hashmap \
 +      test_btf_dump test_cgroup_attach xdping
  
  BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c)))
  TEST_GEN_FILES = $(BPF_OBJ_FILES)

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