]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 8 May 2019 00:22:09 +0000 (17:22 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 May 2019 00:22:09 +0000 (17:22 -0700)
commit9f7ff66f79411041517aa7c118acf3a36564e387
tree544bf5861113e2f7e676a333a1267d887c800870
parent17af5dee25ab01486fef7781abe12a7ffeda476a
parent892e9a8b8853194538da1c906be0b572428e76bf
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Minor conflict with the DSA legacy code removal.

Signed-off-by: David S. Miller <davem@davemloft.net>
Documentation/devicetree/bindings/net/ethernet.txt
drivers/net/ethernet/amazon/ena/ena_netdev.c
drivers/net/ethernet/cadence/macb_main.c
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
drivers/net/hyperv/netvsc.c
drivers/net/phy/phy_device.c
net/core/neighbour.c
net/dsa/dsa.c
net/ipv4/ipmr_base.c
net/sched/cls_cgroup.c
net/sched/cls_matchall.c