Merge remote-tracking branch 'workqueues/for-next'

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc block/blk-core.c
Simple merge

diff --cc drivers/net/phy/phy.c
index 10d058ab4f7969b50a0f8b378ac360e263b2104e,984c0b5ba1743e315a7d0f40c67a5e5063357990..36c6994436b7ce7edb9ff9a0d9725c1aa09a4407
--- 1/drivers/net/phy/phy.c
--- 2/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@@ -916,17 -918,10 +916,18 @@@ void phy_state_machine(struct work_stru
        if (err < 0)
                phy_error(phydev);
  
-       schedule_delayed_work(&phydev->state_queue, PHY_STATE_TIME * HZ);
+       queue_delayed_work(system_power_efficient_wq, &phydev->state_queue,
+                       PHY_STATE_TIME * HZ);
  }
  
 +void phy_mac_interrupt(struct phy_device *phydev, int new_link)
 +{
 +      cancel_work_sync(&phydev->phy_queue);
 +      phydev->link = new_link;
 +      schedule_work(&phydev->phy_queue);
 +}
 +EXPORT_SYMBOL(phy_mac_interrupt);
 +
  static inline void mmd_phy_indirect(struct mii_bus *bus, int prtad, int devad,
                                    int addr)
  {