Merge branch 'pm-freezer' into pm-sleep

* pm-freezer: (26 commits)
  Freezer / sunrpc / NFS: don't allow TASK_KILLABLE sleeps to block the freezer
  Freezer: fix more fallout from the thaw_process rename
  freezer: fix wait_event_freezable/__thaw_task races
  freezer: kill unused set_freezable_with_signal()
  dmatest: don't use set_freezable_with_signal()
  usb_storage: don't use set_freezable_with_signal()
  freezer: remove unused @sig_only from freeze_task()
  freezer: use lock_task_sighand() in fake_signal_wake_up()
  freezer: restructure __refrigerator()
  freezer: fix set_freezable[_with_signal]() race
  freezer: remove should_send_signal() and update frozen()
  freezer: remove now unused TIF_FREEZE
  freezer: make freezing() test freeze conditions in effect instead of TIF_FREEZE
  cgroup_freezer: prepare for removal of TIF_FREEZE
  freezer: clean up freeze_processes() failure path
  freezer: kill PF_FREEZING
  freezer: test freezable conditions while holding freezer_lock
  freezer: make freezing indicate freeze condition in effect
  freezer: use dedicated lock instead of task_lock() + memory barrier
  freezer: don't distinguish nosig tasks on thaw
  ...

diff --cc kernel/power/hibernate.c
index 5314a94a92c1d07ac331b1868dcae9ce2368c458,e7ffa8952083808dd71028569059433f39e4dd9c..605149a6d21904153779aaefda353f7df013bacd
--- 1/kernel/power/hibernate.c
--- 2/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@@ -790,13 -800,11 +779,13 @@@ static int software_resume(void
                goto close_finish;
  
        error = create_basic_memory_bitmaps();
 -      if (error)
 +      if (error) {
 +              usermodehelper_enable();
                goto close_finish;
 +      }
  
        pr_debug("PM: Preparing processes for restore.\n");
-       error = prepare_processes();
+       error = freeze_processes();
        if (error) {
                swsusp_close(FMODE_READ);
                goto Done;

diff --cc kernel/power/user.c
Simple merge