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

author	David S. Miller <davem@davemloft.net>
	Wed, 8 May 2019 00:22:09 +0000 (17:22 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 8 May 2019 00:22:09 +0000 (17:22 -0700)
commit	a9e41a529681b38087c91ebc0bb91e12f510ca2d
tree	544bf5861113e2f7e676a333a1267d887c800870	tree \| snapshot
parent	23bfaa594002f4bba085e0a1ae3c9847b988d816	commit \| diff
parent	a3147770bea76c8dbad73eca3a24c2118da5e719	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Minor conflict with the DSA legacy code removal.

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

John Crispins staging tree

Documentation/devicetree/bindings/net/ethernet.txt	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amazon/ena/ena_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/netvsc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/dsa/dsa.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipmr_base.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_cgroup.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_matchall.c	diff1 \|	diff2 \|	blob \| history