Merge tag 'v4.0-rc3' into drm-next

Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get
some mainline bug fixes needed for my testing box

Conflicts:
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/intel_display.c

1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index e75d48c0421a..cd2f96b2c572 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -5121,12 +5121,17 @@ static inline sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int
                 schedule_timeout_uninterruptible(1);
         }
         /* Need to check if array will still be degraded after recovery/resync
-         * We don't need to check the 'failed' flag as when that gets set,
-         * recovery aborts.
+         * Note in case of > 1 drive failures it's possible we're rebuilding
+         * one drive while leaving another faulty drive in array.
          */
-        for (i = 0; i < conf->raid_disks; i++)
-                if (conf->disks[i].rdev == NULL)
+        rcu_read_lock();
+        for (i = 0; i < conf->raid_disks; i++) {
+                struct md_rdev *rdev = ACCESS_ONCE(conf->disks[i].rdev);
+
+                if (rdev == NULL || test_bit(Faulty, &rdev->flags))
                         still_degraded = 1;
+        }
+        rcu_read_unlock();
 
         bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, still_degraded);