Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 17 Dec 2017 03:11:55 +0000 (22:11 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 17 Dec 2017 03:11:55 +0000 (22:11 -0500)
commitc30abd5e40dd863f88e26be09b6ce949145a630a
tree5b25362084308502a336d8da26b8dc7430d7c812
parent28dc4c8f4557d82e9be020e85e2362239270e704
parentf3b5ad89de16f5d42e8ad36fbdf85f705c1ae051
Merge git://git./linux/kernel/git/davem/net

Three sets of overlapping changes, two in the packet scheduler
and one in the meson-gxl PHY driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
25 files changed:
MAINTAINERS
arch/arm/boot/dts/imx53.dtsi
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
drivers/net/phy/at803x.c
drivers/net/phy/marvell.c
drivers/net/phy/mdio_bus.c
drivers/net/phy/meson-gxl.c
drivers/net/phy/phy.c
drivers/net/phy/phy_device.c
drivers/net/usb/qmi_wwan.c
drivers/of/of_mdio.c
include/linux/pci.h
include/linux/spinlock.h
include/net/ip.h
include/net/sch_generic.h
net/dsa/slave.c
net/ipv4/ip_gre.c
net/ipv4/tcp_input.c
net/ipv4/tcp_timer.c
net/netlink/af_netlink.c
net/sched/cls_api.c
net/sched/sch_api.c
net/sctp/socket.c
net/tipc/socket.c
tools/testing/selftests/bpf/Makefile