Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 27 Aug 2019 21:23:31 +0000 (14:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Aug 2019 21:23:31 +0000 (14:23 -0700)
commit68aaf4459556b1f9370c259fd486aecad2257552
tree99d92536a3263634969be6b70a96facea85a0df1
parentd00ee466a07eb9182ad3caf6140c7ebb527b4c64
parent9e8312f5e160ade069e131d54ab8652cf0e86e1a
Merge git://git./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>
17 files changed:
MAINTAINERS
drivers/net/dsa/bcm_sf2.c
drivers/net/ethernet/netronome/nfp/flower/offload.c
drivers/net/ethernet/qlogic/qed/qed_main.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/usb/r8152.c
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
drivers/s390/net/qeth_core_main.c
kernel/bpf/verifier.c
net/core/filter.c
net/core/flow_dissector.c
net/mac80211/cfg.c
net/ncsi/ncsi-rsp.c
net/wireless/reg.c
net/wireless/util.c
net/xdp/xdp_umem.c
tools/testing/selftests/bpf/Makefile