diff --git a/[refs] b/[refs]
index 70b5a20edfe8..67b4c813542f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df10cfbc4d7ab93260d997df754219d390d62a9d
+refs/heads/master: e542713529e323ff09d7aeb5806cf29f6f160f53
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index 0f1b83096425..c7aae66c6f9b 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -5996,7 +5996,8 @@ static int remove_and_add_spares(mddev_t *mddev)
 	if (mddev->degraded) {
 		rdev_for_each(rdev, rtmp, mddev) {
 			if (rdev->raid_disk >= 0 &&
-			    !test_bit(In_sync, &rdev->flags))
+			    !test_bit(In_sync, &rdev->flags) &&
+			    !test_bit(Blocked, &rdev->flags))
 				spares++;
 			if (rdev->raid_disk < 0
 			    && !test_bit(Faulty, &rdev->flags)) {