Merge remote-tracking branch 'tmem/tmem'

Conflicts:
	mm/swapfile.c

diff --cc drivers/staging/zcache/zcache-main.c
Simple merge

diff --cc fs/buffer.c
Simple merge

diff --cc fs/super.c
Simple merge

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

diff --cc mm/Kconfig
Simple merge

diff --cc mm/Makefile
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc mm/swapfile.c
index c9d654009125d506053059262a63fe6e0637a394,9d79741712ff827a8d71427e6d03a927a6dc3995..a9b07e2401285126e57ef2db003de07283085a77
--- 1/mm/swapfile.c
--- 2/mm/swapfile.c
+++ b/mm/swapfile.c
@@@ -1616,8 -1637,8 +1637,8 @@@ SYSCALL_DEFINE1(swapoff, const char __u
        spin_unlock(&swap_lock);
  
        oom_score_adj = test_set_oom_score_adj(OOM_SCORE_ADJ_MAX);
-       err = try_to_unuse(type);
+       err = try_to_unuse(type, false, 0); /* force all pages to be unused */
 -      test_set_oom_score_adj(oom_score_adj);
 +      compare_swap_oom_score_adj(OOM_SCORE_ADJ_MAX, oom_score_adj);
  
        if (err) {
                /*