Merge drm-upstream/drm-next into drm-misc-next

We got a few conflicts in drm_atomic.c after merging the DRM writeback support,
now we need a backmerge to unlock develop development on drm-misc-next.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 023190c69dce..7441bd93b732 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -115,6 +115,7 @@ static int bdi_debug_register(struct backing_dev_info *bdi, const char *name)
                                                bdi, &bdi_debug_stats_fops);
         if (!bdi->debug_stats) {
                 debugfs_remove(bdi->debug_dir);
+                bdi->debug_dir = NULL;
                 return -ENOMEM;
         }
 
@@ -383,7 +384,7 @@ static void wb_shutdown(struct bdi_writeback *wb)
          * the barrier provided by test_and_clear_bit() above.
          */
         smp_wmb();
-        clear_bit(WB_shutting_down, &wb->state);
+        clear_and_wake_up_bit(WB_shutting_down, &wb->state);
 }
 
 static void wb_exit(struct bdi_writeback *wb)