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

Three trivial overlapping conflicts.

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

diff --cc Documentation/networking/ip-sysctl.txt
index c9538a3,c4ac352..725b8be
--- 1/Documentation/networking/ip-sysctl.txt
--- 2/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@@ -1939,17 -1920,8 +1940,18 @@@ echo_ignore_all - BOOLEA
        requests sent to it over the IPv6 protocol.
        Default: 0
  
 +echo_ignore_multicast - BOOLEAN
 +      If set non-zero, then the kernel will ignore all ICMP ECHO
 +      requests sent to it over the IPv6 protocol via multicast.
 +      Default: 0
 +
 +echo_ignore_anycast - BOOLEAN
 +      If set non-zero, then the kernel will ignore all ICMP ECHO
 +      requests sent to it over the IPv6 protocol destined to anycast address.
 +      Default: 0
 +
  xfrm6_gc_thresh - INTEGER
+       (Obsolete since linux-4.14)
        The threshold at which we will start garbage collecting for IPv6
        destination cache entries.  At twice this value the system will
        refuse new allocations.

diff --cc Makefile
Simple merge

diff --cc drivers/infiniband/hw/mlx5/main.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/qp.c
Simple merge

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

diff --cc drivers/net/phy/marvell.c
Simple merge

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

diff --cc drivers/net/wireless/intel/iwlwifi/cfg/22000.c
index fc915ec,0a87d87..17b34f6
--- 1/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
--- 2/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
@@@ -207,11 -201,9 +207,11 @@@ static const struct iwl_ht_params iwl_2
  #define IWL_DEVICE_AX210                                              \
        IWL_DEVICE_AX200_COMMON,                                        \
        .device_family = IWL_DEVICE_FAMILY_AX210,                       \
-       .base_params = &iwl_22000_base_params,                          \
+       .base_params = &iwl_22560_base_params,                          \
        .csr = &iwl_csr_v1,                                             \
 -      .min_txq_size = 128
 +      .min_txq_size = 128,                                            \
 +      .gp2_reg_addr = 0xd02c68,                                       \
 +      .min_256_ba_txq_size = 512
  
  const struct iwl_cfg iwl22000_2ac_cfg_hr = {
        .name = "Intel(R) Dual Band Wireless AC 22000",

diff --cc drivers/net/wireless/intel/iwlwifi/fw/file.h
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
Simple merge

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

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

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

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

diff --cc fs/proc/proc_sysctl.c
Simple merge

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

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

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

diff --cc lib/Kconfig.debug
Simple merge

diff --cc net/appletalk/ddp.c
Simple merge

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

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

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

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

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

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

diff --cc net/ipv6/route.c
index b18e85c,0520aca..23a20d6
--- 1/net/ipv6/route.c
--- 2/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@@ -3494,17 -3391,11 +3489,14 @@@ static void rt6_do_redirect(struct dst_
                     NDISC_REDIRECT, &ndopts);
  
        rcu_read_lock();
 -      from = rcu_dereference(rt->from);
 -      if (!from)
 +      res.f6i = rcu_dereference(rt->from);
-       /* This fib6_info_hold() is safe here because we hold reference to rt
-        * and rt already holds reference to fib6_info.
-        */
-       fib6_info_hold(res.f6i);
-       rcu_read_unlock();
++      if (!res.f6i)
+               goto out;
  
 -      nrt = ip6_rt_cache_alloc(from, &msg->dest, NULL);
 +      res.nh = &res.f6i->fib6_nh;
 +      res.fib6_flags = res.f6i->fib6_flags;
 +      res.fib6_type = res.f6i->fib6_type;
 +      nrt = ip6_rt_cache_alloc(&res, &msg->dest, NULL);
        if (!nrt)
                goto out;
  
@@@ -3514,11 -3405,8 +3506,8 @@@
  
        nrt->rt6i_gateway = *(struct in6_addr *)neigh->primary_key;
  
-       /* No need to remove rt from the exception table if rt is
-        * a cached route because rt6_insert_exception() will
-        * takes care of it
-        */
+       /* rt6_insert_exception() will take care of duplicated exceptions */
 -      if (rt6_insert_exception(nrt, from)) {
 +      if (rt6_insert_exception(nrt, &res)) {
                dst_release_immediate(&nrt->dst);
                goto out;
        }

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

diff --cc net/netlink/genetlink.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/sctp/sm_statefuns.c
Simple merge

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

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

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

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

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

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

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

diff --cc tools/lib/bpf/.gitignore
index 7d9e182,fecb78a..d9e9dec
--- 1/tools/lib/bpf/.gitignore
--- 2/tools/lib/bpf/.gitignore
+++ b/tools/lib/bpf/.gitignore
@@@ -1,4 -1,4 +1,5 @@@
  libbpf_version.h
 +libbpf.pc
  FEATURE-DUMP.libbpf
  test_libbpf
+ libbpf.so.*