diff --git a/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch b/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch
index b8ae1e1..a911fe6 100644
--- a/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch
+++ b/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian King <brking@linux.vnet.ibm.com>
 Date: Wed, 25 Oct 2017 10:42:59 +1100
-Subject: [PATCH 1/7] xhci: Reset controller on xhci shutdown
+Subject: [PATCH 1/8] xhci: Reset controller on xhci shutdown
 
 Fixes kexec boot. Without a hard reset, some USB chips will fail to
 initialize in a kexec booted kernel.
@@ -14,7 +14,7 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 03d1e552769b..1e1624f5be9f 100644
+index ee9d2e0fc53a..e2ced6c34620 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
 @@ -793,6 +793,7 @@ static void xhci_shutdown(struct usb_hcd *hcd)
diff --git a/openpower/linux/0002-powerpc-opal-add-MPIPL-interface-definitions.patch b/openpower/linux/0002-powerpc-opal-add-MPIPL-interface-definitions.patch
index 4b40909..9fad7d8 100644
--- a/openpower/linux/0002-powerpc-opal-add-MPIPL-interface-definitions.patch
+++ b/openpower/linux/0002-powerpc-opal-add-MPIPL-interface-definitions.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hari Bathini <hbathini@linux.ibm.com>
 Date: Wed, 9 Oct 2019 10:45:19 +0530
-Subject: [PATCH 2/7] powerpc/opal: add MPIPL interface definitions
+Subject: [PATCH 2/8] powerpc/opal: add MPIPL interface definitions
 
 MPIPL is Memory Preserving IPL supported from POWER9. This enables the
 kernel to reset the system with memory 'preserved'. Also, it supports
diff --git a/openpower/linux/0003-powerpc-fadump-improve-how-crashed-kernel-s-memory-i.patch b/openpower/linux/0003-powerpc-fadump-improve-how-crashed-kernel-s-memory-i.patch
index 752730e..eb6750b 100644
--- a/openpower/linux/0003-powerpc-fadump-improve-how-crashed-kernel-s-memory-i.patch
+++ b/openpower/linux/0003-powerpc-fadump-improve-how-crashed-kernel-s-memory-i.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hari Bathini <hbathini@linux.ibm.com>
 Date: Wed, 9 Oct 2019 10:45:26 +0530
-Subject: [PATCH 3/7] powerpc/fadump: improve how crashed kernel's memory is
+Subject: [PATCH 3/8] powerpc/fadump: improve how crashed kernel's memory is
  reserved
 
 The size parameter to fadump_reserve_crash_area() function is not needed
diff --git a/openpower/linux/0004-powerpc-fadump-add-support-to-preserve-crash-data-on.patch b/openpower/linux/0004-powerpc-fadump-add-support-to-preserve-crash-data-on.patch
index 5ec6134..5a92339 100644
--- a/openpower/linux/0004-powerpc-fadump-add-support-to-preserve-crash-data-on.patch
+++ b/openpower/linux/0004-powerpc-fadump-add-support-to-preserve-crash-data-on.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hari Bathini <hbathini@linux.ibm.com>
 Date: Wed, 9 Oct 2019 10:45:34 +0530
-Subject: [PATCH 4/7] powerpc/fadump: add support to preserve crash data on
+Subject: [PATCH 4/8] powerpc/fadump: add support to preserve crash data on
  FADUMP disabled kernel
 
 Add a new kernel config option, CONFIG_PRESERVE_FA_DUMP that ensures
diff --git a/openpower/linux/0005-powerpc-configs-add-FADump-support-in-petitboot-kern.patch b/openpower/linux/0005-powerpc-configs-add-FADump-support-in-petitboot-kern.patch
index 5223dd3..2983711 100644
--- a/openpower/linux/0005-powerpc-configs-add-FADump-support-in-petitboot-kern.patch
+++ b/openpower/linux/0005-powerpc-configs-add-FADump-support-in-petitboot-kern.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hari Bathini <hbathini@linux.ibm.com>
 Date: Wed, 9 Oct 2019 10:45:41 +0530
-Subject: [PATCH 5/7] powerpc/configs: add FADump support in petitboot kernel
+Subject: [PATCH 5/8] powerpc/configs: add FADump support in petitboot kernel
 
 FADump is supported on PowerNV platform. To fulfill this support, the
 petitboot kernel must be FADump aware. Enable config PRESERVE_FA_DUMP
diff --git a/openpower/linux/0006-scsi-lpfc-Fix-oops-when-fewer-hdwqs-than-cpus.patch b/openpower/linux/0006-scsi-lpfc-Fix-oops-when-fewer-hdwqs-than-cpus.patch
index bfda19d..9238a0a 100644
--- a/openpower/linux/0006-scsi-lpfc-Fix-oops-when-fewer-hdwqs-than-cpus.patch
+++ b/openpower/linux/0006-scsi-lpfc-Fix-oops-when-fewer-hdwqs-than-cpus.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: James Smart <jsmart2021@gmail.com>
 Date: Wed, 14 Aug 2019 16:56:43 -0700
-Subject: [PATCH 6/7] scsi: lpfc: Fix oops when fewer hdwqs than cpus
+Subject: [PATCH 6/8] scsi: lpfc: Fix oops when fewer hdwqs than cpus
 
 When tearing down the adapter for a reset, online/offline, or driver
 unload, the queue free routine would hit a GPF oops.  This only occurs on
diff --git a/openpower/linux/0007-scsi-lpfc-Limit-xri-count-for-kdump-environment.patch b/openpower/linux/0007-scsi-lpfc-Limit-xri-count-for-kdump-environment.patch
new file mode 100644
index 0000000..71ae797
--- /dev/null
+++ b/openpower/linux/0007-scsi-lpfc-Limit-xri-count-for-kdump-environment.patch
@@ -0,0 +1,53 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: James Smart <jsmart2021@gmail.com>
+Date: Wed, 14 Aug 2019 16:56:31 -0700
+Subject: [PATCH 7/8] scsi: lpfc: Limit xri count for kdump environment
+
+scsi-mq operation inherently performs pre-allocation of resources for
+blk-mq request queues. Even though the kdump environment reduces the
+configuration to a single CPU, thus 1 hardware queue, which helps
+significantly, the resources are still rather large due to the per request
+allocations. blk-mq pre-allocations can be over 4KB per request.  With
+adapter can_queue values in the 4k or 8k range, this can easily be 32MBs
+before any other driver memory is factored in.  Driver SGL DMA buffer
+allocation can be up to 8KB per request as well adding an additional
+64MB. Totals are well over 100MB for a single shost.  Given kdump memory
+auto-sizing utilities don't accommodate this amount of memory well, it's
+very possible for kdump to fail due to lack of memory.
+
+Fix by having the driver recognize that it is booting within a kdump
+context and reduce the number of requests it will support to a more
+reasonable value.
+
+Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
+Signed-off-by: James Smart <jsmart2021@gmail.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+(cherry picked from commit 31f06d2e73726160645f8d9976a0b3f42e136da7)
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+---
+ drivers/scsi/lpfc/lpfc_init.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
+index a5b515fdda2e..7edbba7debc2 100644
+--- a/drivers/scsi/lpfc/lpfc_init.c
++++ b/drivers/scsi/lpfc/lpfc_init.c
+@@ -39,6 +39,7 @@
+ #include <linux/msi.h>
+ #include <linux/irq.h>
+ #include <linux/bitops.h>
++#include <linux/crash_dump.h>
+ 
+ #include <scsi/scsi.h>
+ #include <scsi/scsi_device.h>
+@@ -8309,6 +8310,10 @@ lpfc_sli4_read_config(struct lpfc_hba *phba)
+ 			bf_get(lpfc_mbx_rd_conf_extnts_inuse, rd_config);
+ 		phba->sli4_hba.max_cfg_param.max_xri =
+ 			bf_get(lpfc_mbx_rd_conf_xri_count, rd_config);
++		/* Reduce resource usage in kdump environment */
++		if (is_kdump_kernel() &&
++		    phba->sli4_hba.max_cfg_param.max_xri > 512)
++			phba->sli4_hba.max_cfg_param.max_xri = 512;
+ 		phba->sli4_hba.max_cfg_param.xri_base =
+ 			bf_get(lpfc_mbx_rd_conf_xri_base, rd_config);
+ 		phba->sli4_hba.max_cfg_param.max_vpi =
diff --git a/openpower/linux/0007-Release-OpenPower-kernel.patch b/openpower/linux/0008-Release-OpenPower-kernel.patch
similarity index 82%
rename from openpower/linux/0007-Release-OpenPower-kernel.patch
rename to openpower/linux/0008-Release-OpenPower-kernel.patch
index b6e2437..1a1240f 100644
--- a/openpower/linux/0007-Release-OpenPower-kernel.patch
+++ b/openpower/linux/0008-Release-OpenPower-kernel.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Joel Stanley <joel@jms.id.au>
 Date: Tue, 16 Jul 2019 11:40:02 +0930
-Subject: [PATCH 7/7] Release OpenPower kernel
+Subject: [PATCH 8/8] Release OpenPower kernel
 
 Signed-off-by: Joel Stanley <joel@jms.id.au>
 ---
@@ -9,13 +9,13 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index d7469f0926a6..42db3c0998f2 100644
+index 7a3e659c79ae..6f9b6f4b3b5c 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -2,7 +2,7 @@
  VERSION = 5
  PATCHLEVEL = 3
- SUBLEVEL = 6
+ SUBLEVEL = 7
 -EXTRAVERSION =
 +EXTRAVERSION = -openpower1
  NAME = Bobtail Squid