Merge branch 'for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

Pull workqueue update from Tejun Heo:
 "Workqueue changes for v4.5.  One cleanup patch and three to improve
  the debuggability.

  Workqueue now has a stall detector which dumps workqueue state if any
  worker pool hasn't made forward progress over a certain amount of time
  (30s by default) and also triggers a warning if a workqueue which can
  be used in memory reclaim path tries to wait on something which can't
  be.

  These should make workqueue hangs a lot easier to debug."

* 'for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: simplify the apply_workqueue_attrs_locked()
  workqueue: implement lockup detector
  watchdog: introduce touch_softlockup_watchdog_sched()
  workqueue: warn if memory reclaim tries to flush !WQ_MEM_RECLAIM workqueue

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

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sched/clock.c
Simple merge

diff --cc kernel/time/tick-sched.c
index 99ef0df1280737f463ea578addc7967da4a2c810,58219f6ff3c6f99bf733313c475fff8a69ce4e4a..9cc20af58c76300111f23a007b9fd5ad0c8bd60b
--- 1/kernel/time/tick-sched.c
--- 2/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@@ -714,10 -698,10 +714,10 @@@ static void tick_nohz_restart_sched_tic
  {
        /* Update jiffies first */
        tick_do_update_jiffies64(now);
 -      update_cpu_load_nohz();
 +      update_cpu_load_nohz(active);
  
        calc_load_exit_idle();
-       touch_softlockup_watchdog();
+       touch_softlockup_watchdog_sched();
        /*
         * Cancel the scheduled timer and restore the tick
         */

diff --cc kernel/watchdog.c
Simple merge