git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d00ee46 9e8312f)

author	David S. Miller <davem@davemloft.net>
	Tue, 27 Aug 2019 21:23:31 +0000 (14:23 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 27 Aug 2019 21:23:31 +0000 (14:23 -0700)
commit	68aaf4459556b1f9370c259fd486aecad2257552
tree	99d92536a3263634969be6b70a96facea85a0df1	tree \| snapshot
parent	d00ee466a07eb9182ad3caf6140c7ebb527b4c64	commit \| diff
parent	9e8312f5e160ade069e131d54ab8652cf0e86e1a	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/bcm_sf2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/flower/offload.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_core_main.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/flow_dissector.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/ncsi/ncsi-rsp.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history
net/wireless/util.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xdp_umem.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/Makefile	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree