diff --git a/[refs] b/[refs]
index 29b3803ae171..b363af4c9477 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b522adcde9c4d3fb7b579cfa9160d8bde7744be8
+refs/heads/master: 18b0033491f584a2d79697da714b1ef9d6b27d22
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index 1aebd3ef80b7..e1ee181b79bb 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -4331,7 +4331,7 @@ static int run(mddev_t *mddev)
 		 */
 		sector_t here_new, here_old;
 		int old_disks;
-		int max_degraded = (mddev->level == 5 ? 1 : 2);
+		int max_degraded = (mddev->level == 6 ? 2 : 1);
 
 		if (mddev->new_level != mddev->level ||
 		    mddev->new_layout != mddev->layout ||