projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 52f80dc 48b6bbe)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 21 Jun 2017 21:35:22 +0000 (17:35 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 Jun 2017 21:35:22 +0000 (17:35 -0400)
commit3d09198243b89457649241fb63f809a96a22a8ce
treef8f62d4a0b47ebc44682363a8d23b8963e1ca3e9tree | snapshot
parent52f80dca7a1a9f4ad6f6bd5a9b9d25851e3d670acommit | diff
parent48b6bbef9a1789f0365c1a385879a1fea4460016commit | diff
Merge git://git./linux/kernel/git/davem/net

Two entries being added at the same time to the IFLA
policy table, whilst parallel bug fixes to decnet
routing dst handling overlapping with the dst gc removal
in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
25 files changed:
Documentation/devicetree/bindings/net/dsa/b53.txt diff1 | diff2 | blob | history
arch/arm/boot/dts/sunxi-h3-h5.dtsi diff1 | diff2 | blob | history
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi diff1 | diff2 | blob | history
drivers/infiniband/core/addr.c diff1 | diff2 | blob | history
drivers/infiniband/hw/mlx5/main.c diff1 | diff2 | blob | history
drivers/infiniband/hw/qedr/qedr.h diff1 | diff2 | blob | history
drivers/infiniband/hw/qedr/verbs.c diff1 | diff2 | blob | history
drivers/infiniband/ulp/ipoib/ipoib_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c diff1 | diff2 | blob | history
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/main.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/dev_ioctl.c diff1 | diff2 | blob | history
net/core/rtnetlink.c diff1 | diff2 | blob | history
net/decnet/dn_route.c diff1 | diff2 | blob | history
net/ipv4/igmp.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
net/ipv6/ip6_fib.c diff1 | diff2 | blob | history
net/sctp/socket.c diff1 | diff2 | blob | history
John Crispins staging tree