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

Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/bcm_sf2.c
Simple merge

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

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

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

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

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

diff --cc drivers/s390/net/qeth_core_main.c
Simple merge

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

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

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

diff --cc net/mac80211/cfg.c
index ed56b0c,111c400..7c6edb7
--- 1/net/mac80211/cfg.c
--- 2/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@@ -1546,9 -1543,14 +1546,14 @@@ static int ieee80211_add_station(struc
        if (ether_addr_equal(mac, sdata->vif.addr))
                return -EINVAL;
  
 -      if (is_multicast_ether_addr(mac))
 +      if (!is_valid_ether_addr(mac))
                return -EINVAL;
  
+       if (params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER) &&
+           sdata->vif.type == NL80211_IFTYPE_STATION &&
+           !sdata->u.mgd.associated)
+               return -EINVAL;
+ 
        sta = sta_info_alloc(sdata, mac, GFP_KERNEL);
        if (!sta)
                return -ENOMEM;

diff --cc net/ncsi/ncsi-rsp.c
Simple merge

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

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

diff --cc net/xdp/xdp_umem.c
Simple merge

diff --cc tools/testing/selftests/bpf/Makefile
Simple merge