diff --git a/[refs] b/[refs]
index 6b5fac378c46..da68e05a0015 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f442e64b93e16dba6bf9ab7e8dc5a90f6bcd8a85
+refs/heads/master: 186fb9cf6a1154bc9b071adfd72fcf256285eb26
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 2e547bddc5a7..9e761b994b4c 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -4079,6 +4079,11 @@ static int __devinit cciss_find_cfgtables(ctlr_info_t *h)
 static void __devinit cciss_get_max_perf_mode_cmds(struct ctlr_info *h)
 {
 	h->max_commands = readl(&(h->cfgtable->MaxPerformantModeCommands));
+
+	/* Limit commands in memory limited kdump scenario. */
+	if (reset_devices && h->max_commands > 32)
+		h->max_commands = 32;
+
 	if (h->max_commands < 16) {
 		dev_warn(&h->pdev->dev, "Controller reports "
 			"max supported commands of %d, an obvious lie. "