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>

diff --cc Documentation/devicetree/bindings/net/ethernet.txt
Simple merge

diff --cc drivers/net/ethernet/amazon/ena/ena_netdev.c
Simple merge

diff --cc drivers/net/ethernet/cadence/macb_main.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Simple merge

diff --cc drivers/net/hyperv/netvsc.c
Simple merge

diff --cc drivers/net/phy/phy_device.c
Simple merge

diff --cc net/core/neighbour.c
Simple merge

diff --cc net/dsa/dsa.c
index 9e1fc0b0829079a07be3569b9a313c10a5147ca0,cb080efdc7b32fa34e05001cd0ca4a34dcd6dfb3..1fc782fab393cd756c7dde34ec126a4a64f28735
--- 1/net/dsa/dsa.c
--- 2/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@@ -344,14 -344,22 +344,19 @@@ static int __init dsa_init_module(void
  
        rc = dsa_slave_register_notifier();
        if (rc)
-               return rc;
+               goto register_notifier_fail;
  
 -      rc = dsa_legacy_register();
 -      if (rc)
 -              goto legacy_register_fail;
 -
        dev_add_pack(&dsa_pack_type);
  
 +      dsa_tag_driver_register(&DSA_TAG_DRIVER_NAME(none_ops),
 +                              THIS_MODULE);
 +
        return 0;
 -legacy_register_fail:
 -      dsa_slave_unregister_notifier();
+ 
+ register_notifier_fail:
+       destroy_workqueue(dsa_owq);
+ 
+       return rc;
  }
  module_init(dsa_init_module);
  

diff --cc net/ipv4/ipmr_base.c
Simple merge

diff --cc net/sched/cls_cgroup.c
Simple merge

diff --cc net/sched/cls_matchall.c
Simple merge