Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_ptp.c
Simple merge

diff --cc drivers/net/phy/broadcom.c
index c73e265,7045370..aa73c5c
--- 1/drivers/net/phy/broadcom.c
--- 2/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@@ -629,7 -647,9 +642,8 @@@ static struct phy_driver broadcom_drive
        .phy_id_mask    = 0xfffffff0,
        .name           = "Broadcom BCM54616S",
        .features       = PHY_GBIT_FEATURES,
 -      .flags          = PHY_HAS_INTERRUPT,
        .config_init    = bcm54xx_config_init,
+       .config_aneg    = bcm54616s_config_aneg,
        .ack_interrupt  = bcm_phy_ack_intr,
        .config_intr    = bcm_phy_config_intr,
  }, {

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

diff --cc net/tipc/link.c
Simple merge