Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/fs/proc/page.c b/fs/proc/page.c
index a2066e6dee90..2726536489b1 100644
--- a/fs/proc/page.c
+++ b/fs/proc/page.c
@@ -173,7 +173,8 @@ u64 stable_page_flags(struct page *page)
         u |= kpf_copy_bit(k, KPF_ACTIVE,        PG_active);
         u |= kpf_copy_bit(k, KPF_RECLAIM,       PG_reclaim);
 
-        u |= kpf_copy_bit(k, KPF_SWAPCACHE,     PG_swapcache);
+        if (PageSwapCache(page))
+                u |= 1 << KPF_SWAPCACHE;
         u |= kpf_copy_bit(k, KPF_SWAPBACKED,    PG_swapbacked);
 
         u |= kpf_copy_bit(k, KPF_UNEVICTABLE,   PG_unevictable);