linux-next: manual merge of the pm tree with the xfs tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Rafael,

Today's linux-next merge of the pm tree got a conflict in
fs/xfs/xfs_buf.c between commit 687d1c5e8e26 ("xfs: remove unused
XBT_FORCE_SLEEP bit") from the xfs tree and commit a0acae0e886d
("freezer: unexport refrigerator() and update try_to_freeze() slightly")
from the pm tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/xfs/xfs_buf.c
index f84777e,0188299..0000000
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@@ -1701,8 -1701,12 +1701,8 @@@ xfsbufd
                struct list_head tmp;
                struct blk_plug plug;
  
 -              if (unlikely(freezing(current))) {
 -                      set_bit(XBT_FORCE_SLEEP, &target->bt_flags);
 +              if (unlikely(freezing(current)))
-                       refrigerator();
+                       try_to_freeze();
 -              } else {
 -                      clear_bit(XBT_FORCE_SLEEP, &target->bt_flags);
 -              }
  
                /* sleep for a long time if there is nothing to do. */
                if (list_empty(&target->bt_delwri_queue))

pgpqzGwtnfMa5.pgp
Description: PGP signature