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 6ad582b..bca0375 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/2] xhci: Reset controller on xhci shutdown
+Subject: [PATCH 1/4] 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 5d37700ae4b0..27848c3226a4 100644
+index b60a02c50b89..e335b35ff3ba 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
 @@ -717,6 +717,7 @@ static void xhci_shutdown(struct usb_hcd *hcd)
diff --git a/openpower/linux/0002-scsi-aacraid-Correct-hba_send-to-include-iu_type.patch b/openpower/linux/0002-scsi-aacraid-Correct-hba_send-to-include-iu_type.patch
new file mode 100644
index 0000000..7d46561
--- /dev/null
+++ b/openpower/linux/0002-scsi-aacraid-Correct-hba_send-to-include-iu_type.patch
@@ -0,0 +1,55 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Dave Carroll <david.carroll@microsemi.com>
+Date: Wed, 25 Apr 2018 10:24:20 -0600
+Subject: [PATCH 2/4] scsi: aacraid: Correct hba_send to include iu_type
+
+commit b60710ec7d7a ("scsi: aacraid: enable sending of TMFs from
+aac_hba_send()") allows aac_hba_send() to send scsi commands, and TMF
+requests, but the existing code only updates the iu_type for scsi
+commands. For TMF requests we are sending an unknown iu_type to
+firmware, which causes a fault.
+
+Include iu_type prior to determining the validity of the command
+
+Reported-by: Noah Misner <nmisner@us.ibm.com>
+Fixes: b60710ec7d7ab ("aacraid: enable sending of TMFs from aac_hba_send()")
+Fixes: 423400e64d377 ("aacraid: Include HBA direct interface")
+Tested-by: Noah Misner <nmisner@us.ibm.com>
+cc: stable@vger.kernel.org
+Signed-off-by: Dave Carroll <david.carroll@microsemi.com>
+Reviewed-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
+Reviewed-by: Brian King <brking@linux.vnet.ibm.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+(cherry picked from commit 7d3af7d96af7b9f51e1ef67b6f4725f545737da2)
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+---
+ drivers/scsi/aacraid/commsup.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
+index 84858d5c8257..d9f2229664ad 100644
+--- a/drivers/scsi/aacraid/commsup.c
++++ b/drivers/scsi/aacraid/commsup.c
+@@ -724,6 +724,8 @@ int aac_hba_send(u8 command, struct fib *fibptr, fib_callback callback,
+ 	int wait;
+ 	unsigned long flags = 0;
+ 	unsigned long mflags = 0;
++	struct aac_hba_cmd_req *hbacmd = (struct aac_hba_cmd_req *)
++			fibptr->hw_fib_va;
+ 
+ 	fibptr->flags = (FIB_CONTEXT_FLAG | FIB_CONTEXT_FLAG_NATIVE_HBA);
+ 	if (callback) {
+@@ -734,11 +736,9 @@ int aac_hba_send(u8 command, struct fib *fibptr, fib_callback callback,
+ 		wait = 1;
+ 
+ 
+-	if (command == HBA_IU_TYPE_SCSI_CMD_REQ) {
+-		struct aac_hba_cmd_req *hbacmd =
+-			(struct aac_hba_cmd_req *)fibptr->hw_fib_va;
++	hbacmd->iu_type = command;
+ 
+-		hbacmd->iu_type = command;
++	if (command == HBA_IU_TYPE_SCSI_CMD_REQ) {
+ 		/* bit1 of request_id must be 0 */
+ 		hbacmd->request_id =
+ 			cpu_to_le32((((u32)(fibptr - dev->fibs)) << 2) + 1);
diff --git a/openpower/linux/0003-Release-OpenPower-kernel.patch b/openpower/linux/0003-Release-OpenPower-kernel.patch
deleted file mode 100644
index 598d6b4..0000000
--- a/openpower/linux/0003-Release-OpenPower-kernel.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Stewart Smith <stewart@linux.ibm.com>
-Date: Fri, 11 May 2018 17:41:12 -0700
-Subject: [PATCH 3/3] Release OpenPower kernel
-
-Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 1c5d5d8c45e2..ea0dccd03e90 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,7 +2,7 @@
- VERSION = 4
- PATCHLEVEL = 16
- SUBLEVEL = 7
--EXTRAVERSION =
-+EXTRAVERSION = -openpower2
- NAME = Fearless Coyote
- 
- # *DOCUMENTATION*
diff --git a/openpower/linux/0002-powerpc-perf-Fix-memory-allocation-for-core-imc-base.patch b/openpower/linux/0003-powerpc-perf-Fix-memory-allocation-for-core-imc-base.patch
similarity index 87%
rename from openpower/linux/0002-powerpc-perf-Fix-memory-allocation-for-core-imc-base.patch
rename to openpower/linux/0003-powerpc-perf-Fix-memory-allocation-for-core-imc-base.patch
index ce6ca50..274ce84 100644
--- a/openpower/linux/0002-powerpc-perf-Fix-memory-allocation-for-core-imc-base.patch
+++ b/openpower/linux/0003-powerpc-perf-Fix-memory-allocation-for-core-imc-base.patch
@@ -1,7 +1,7 @@
-From 65c085a4b6b757778f2ebb1f596a6091d1d96bc8 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Anju T Sudhakar <anju@linux.vnet.ibm.com>
 Date: Fri, 11 May 2018 19:13:42 +0530
-Subject: [PATCH] powerpc/perf: Fix memory allocation for core-imc based on
+Subject: [PATCH 3/4] powerpc/perf: Fix memory allocation for core-imc based on
  num_possible_cpus()
 
 Currently memory is allocated for core-imc based on cpu_present_mask, which has
@@ -23,7 +23,9 @@
 
 Reported-by: Pridhiviraj Paidipeddi <ppaidipe@linux.vnet.ibm.com>
 Signed-off-by: Anju T Sudhakar <anju@linux.vnet.ibm.com>
-Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
+Reviewed-by: Balbir Singh <bsingharora@gmail.com>
+Message-Id: <1526046222-17842-1-git-send-email-anju@linux.vnet.ibm.com>
+Signed-off-by: Joel Stanley <joel@jms.id.au>
 ---
  arch/powerpc/perf/imc-pmu.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
@@ -50,6 +52,3 @@
  		pmu_ptr->mem_info = kcalloc(nr_cores, sizeof(struct imc_mem_info),
  								GFP_KERNEL);
  
--- 
-2.14.3
-
diff --git a/openpower/linux/0004-Release-OpenPower-kernel.patch b/openpower/linux/0004-Release-OpenPower-kernel.patch
new file mode 100644
index 0000000..0229f65
--- /dev/null
+++ b/openpower/linux/0004-Release-OpenPower-kernel.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Joel Stanley <joel@jms.id.au>
+Date: Wed, 16 May 2018 13:42:40 +0930
+Subject: [PATCH 4/4] Release OpenPower kernel
+
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 5da6ffd69209..6d6fbae5e2b9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@
+ VERSION = 4
+ PATCHLEVEL = 16
+ SUBLEVEL = 8
+-EXTRAVERSION =
++EXTRAVERSION = -openpower2
+ NAME = Fearless Coyote
+ 
+ # *DOCUMENTATION*