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

The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next'
because we no longer have a per-netns conntrack hash.

The ip_gre.c conflict as well as the iwlwifi ones were cases of
overlapping changes.

Conflicts:
	drivers/net/wireless/intel/iwlwifi/mvm/tx.c
	net/ipv4/ip_gre.c
	net/netfilter/nf_conntrack_core.c

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 603e8db50162..c5dc2c363f96 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -871,9 +871,11 @@ void phy_start(struct phy_device *phydev)
                 break;
         case PHY_HALTED:
                 /* make sure interrupts are re-enabled for the PHY */
-                err = phy_enable_interrupts(phydev);
-                if (err < 0)
-                        break;
+                if (phydev->irq != PHY_POLL) {
+                        err = phy_enable_interrupts(phydev);
+                        if (err < 0)
+                                break;
+                }
 
                 phydev->state = PHY_RESUMING;
                 do_resume = true;