Merge branch 'x86/urgent' into x86/pat

Reason: Change to is_new_memtype_allowed() in x86/urgent

Resolved semantic conflicts in:

	 arch/x86/mm/pat.c
	 arch/x86/mm/ioremap.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 22 insertions, 3 deletions

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 61755cbd978e..eda94fcd4065 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -928,13 +928,32 @@ static void phy_state_machine(struct work_struct *work)
                                  * Otherwise, it's 0, and we're
                                  * still waiting for AN */
                                 if (err > 0) {
-                                        phydev->state = PHY_RUNNING;
+                                        err = phy_read_status(phydev);
+                                        if (err)
+                                                break;
+
+                                        if (phydev->link) {
+                                                phydev->state = PHY_RUNNING;
+                                                netif_carrier_on(phydev->attached_dev);
+                                        } else
+                                                phydev->state = PHY_NOLINK;
+                                        phydev->adjust_link(phydev->attached_dev);
                                 } else {
                                         phydev->state = PHY_AN;
                                         phydev->link_timeout = PHY_AN_TIMEOUT;
                                 }
-                        } else
-                                phydev->state = PHY_RUNNING;
+                        } else {
+                                err = phy_read_status(phydev);
+                                if (err)
+                                        break;
+
+                                if (phydev->link) {
+                                        phydev->state = PHY_RUNNING;
+                                        netif_carrier_on(phydev->attached_dev);
+                                } else
+                                        phydev->state = PHY_NOLINK;
+                                phydev->adjust_link(phydev->attached_dev);
+                        }
                         break;
         }