diff --git a/buildroot b/buildroot
index 6d0f25c..06ae8ee 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit 6d0f25cdf7a7d6d7e66e741f60e677a5507bd89f
+Subproject commit 06ae8ee75147fb08dcde6f23beb8b68f29aac43e
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index a0f9f47..2a1fa06 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -43,7 +43,7 @@
 BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_VERSION="4.2.3"
+BR2_LINUX_KERNEL_VERSION="4.2.4"
 BR2_KERNEL_HEADERS_4_2=y
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index 8aa9b92..7fdba51 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -43,7 +43,7 @@
 BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_VERSION="4.2.3"
+BR2_LINUX_KERNEL_VERSION="4.2.4"
 BR2_KERNEL_HEADERS_4_2=y
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index c03edd2..1208a80 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -43,7 +43,7 @@
 BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_VERSION="4.2.3"
+BR2_LINUX_KERNEL_VERSION="4.2.4"
 BR2_KERNEL_HEADERS_4_2=y
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig
index 0be603c..1adf52d 100644
--- a/openpower/configs/openpower_mambo_defconfig
+++ b/openpower/configs/openpower_mambo_defconfig
@@ -31,7 +31,7 @@
 BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_VERSION="4.2.3"
+BR2_LINUX_KERNEL_VERSION="4.2.4"
 BR2_KERNEL_HEADERS_4_2=y
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index b3ccac8..0d89b07 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -42,7 +42,7 @@
 BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_VERSION="4.2.3"
+BR2_LINUX_KERNEL_VERSION="4.2.4"
 BR2_KERNEL_HEADERS_4_2=y
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
diff --git a/openpower/linux/linux-0001-powerpc-Add-openpower_defconfig.patch b/openpower/linux/linux-0001-powerpc-Add-openpower_defconfig.patch
index 5d2a317..8ce8b7f 100644
--- a/openpower/linux/linux-0001-powerpc-Add-openpower_defconfig.patch
+++ b/openpower/linux/linux-0001-powerpc-Add-openpower_defconfig.patch
@@ -1,7 +1,7 @@
-From 2dd6f872aa2c1731e0c04b22654ee46d831626d0 Mon Sep 17 00:00:00 2001
+From 70f789b86a2daaa88e89d11e1e4c726f110094e7 Mon Sep 17 00:00:00 2001
 From: Jeremy Kerr <jk@ozlabs.org>
 Date: Fri, 12 Dec 2014 08:03:11 +0800
-Subject: [PATCH 01/18] powerpc: Add openpower_defconfig
+Subject: [PATCH 01/17] powerpc: Add openpower_defconfig
 
 Simplifies building an openpower kernel a little. It is based on the
 configuration used by the op-build openpower buildroot overlay.
diff --git a/openpower/linux/linux-0003-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch b/openpower/linux/linux-0002-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
similarity index 81%
rename from openpower/linux/linux-0003-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
rename to openpower/linux/linux-0002-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
index ac021e1..f3d1f88 100644
--- a/openpower/linux/linux-0003-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
+++ b/openpower/linux/linux-0002-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
@@ -1,7 +1,7 @@
-From 12b16e15e73c624f06ab721db8b796b654c3a0c9 Mon Sep 17 00:00:00 2001
+From 8880fc2d44e538e4806780afc76437e844126da9 Mon Sep 17 00:00:00 2001
 From: Thadeu Lima De Souza Cascardo <thadeul@br.ibm.com>
 Date: Tue, 25 Mar 2014 10:45:16 -0400
-Subject: [PATCH 03/18] xhci: Use xhci_pci_remove for xhci device shutdown
+Subject: [PATCH 02/17] xhci: Use xhci_pci_remove for xhci device shutdown
 
 Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
 Signed-off-by: Joel Stanley <joel@jms.id.au>
@@ -10,7 +10,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
-index 5590eac..ed4cabd 100644
+index c79d336..5492bc6 100644
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
 @@ -419,7 +419,7 @@ static struct pci_driver xhci_pci_driver = {
diff --git a/openpower/linux/linux-0002-xhci-do-not-halt-the-secondary-HCD.patch b/openpower/linux/linux-0002-xhci-do-not-halt-the-secondary-HCD.patch
deleted file mode 100644
index c78bf74..0000000
--- a/openpower/linux/linux-0002-xhci-do-not-halt-the-secondary-HCD.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9495fb487a5c58fec056ede804ff5036353acce0 Mon Sep 17 00:00:00 2001
-From: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
-Date: Mon, 10 Mar 2014 13:02:13 -0300
-Subject: [PATCH 02/18] xhci: do not halt the secondary HCD
-
-We can't halt the secondary HCD, because it's also the primary HCD,
-which will cause problems if we have devices attached to the primary
-HCD, like a keyboard.
-
-Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
-Signed-off-by: Joel Stanley <joel@jms.id.au>
----
- drivers/usb/host/xhci.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 526ebc0..07f9683 100644
---- a/drivers/usb/host/xhci.c
-+++ b/drivers/usb/host/xhci.c
-@@ -659,7 +659,18 @@ static void xhci_only_stop_hcd(struct usb_hcd *hcd)
- 	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
- 
- 	spin_lock_irq(&xhci->lock);
--	xhci_halt(xhci);
-+	/*
-+	 * We can't halt the secondary HCD, because it's also the
-+	 * primary HCD, which will cause problems if we have devices
-+	 * attached to the primary HCD, like a keyboard.
-+	 */
-+	/*xhci_halt(xhci);*/
-+
-+	/* The shared_hcd is going to be deallocated shortly (the USB core only
-+	 * calls this function when allocation fails in usb_add_hcd(), or
-+	 * usb_remove_hcd() is called).  So we need to unset xHCI's pointer.
-+	 */
-+	xhci->shared_hcd = NULL;
- 	spin_unlock_irq(&xhci->lock);
- }
- 
--- 
-2.5.0
-
diff --git a/openpower/linux/linux-0004-drm-ast-Default-to-8bpp-on-big-endian.patch b/openpower/linux/linux-0003-drm-ast-Default-to-8bpp-on-big-endian.patch
similarity index 91%
rename from openpower/linux/linux-0004-drm-ast-Default-to-8bpp-on-big-endian.patch
rename to openpower/linux/linux-0003-drm-ast-Default-to-8bpp-on-big-endian.patch
index 3d49166..3427346 100644
--- a/openpower/linux/linux-0004-drm-ast-Default-to-8bpp-on-big-endian.patch
+++ b/openpower/linux/linux-0003-drm-ast-Default-to-8bpp-on-big-endian.patch
@@ -1,7 +1,7 @@
-From a5be24c34d70c16b65c3a68d8becd04fdbfd5300 Mon Sep 17 00:00:00 2001
+From 3974f00104e399e91a0ab0f4b0f5e26e1f5e2ff9 Mon Sep 17 00:00:00 2001
 From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 Date: Fri, 31 Oct 2014 15:06:38 +1100
-Subject: [PATCH 04/18] drm/ast: Default to 8bpp on big endian
+Subject: [PATCH 03/17] drm/ast: Default to 8bpp on big endian
 
 This chip is LE only (some versions support HW swappers but not
 the latest and the driver doesn't anyway).
diff --git a/openpower/linux/linux-0005-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch b/openpower/linux/linux-0004-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch
similarity index 90%
rename from openpower/linux/linux-0005-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch
rename to openpower/linux/linux-0004-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch
index f4ba919..fc1bd5f 100644
--- a/openpower/linux/linux-0005-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch
+++ b/openpower/linux/linux-0004-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch
@@ -1,7 +1,7 @@
-From be50ab4cae5557c5df79c347e75e2eb4ce71cd6f Mon Sep 17 00:00:00 2001
+From 8bd51183220742ce12d4c231d8a2cff13df796c4 Mon Sep 17 00:00:00 2001
 From: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
 Date: Mon, 29 Jun 2015 13:43:51 +1000
-Subject: [PATCH 05/18] powerpc/kexec: Reset secondary cpu endianess before
+Subject: [PATCH 04/17] powerpc/kexec: Reset secondary cpu endianess before
  kexec
 
 If the target kernel does not inlcude the FIXUP_ENDIAN check, coming
diff --git a/openpower/linux/linux-0006-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch b/openpower/linux/linux-0005-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch
similarity index 91%
rename from openpower/linux/linux-0006-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch
rename to openpower/linux/linux-0005-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch
index 95411b4..ac3f985 100644
--- a/openpower/linux/linux-0006-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch
+++ b/openpower/linux/linux-0005-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch
@@ -1,7 +1,7 @@
-From 2359429f4bd73ceaef1747320032ce1831fa49a4 Mon Sep 17 00:00:00 2001
+From 051c24b3c8b32db05e575e29c3a9d66c924e4bfc Mon Sep 17 00:00:00 2001
 From: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
 Date: Wed, 22 Jul 2015 11:09:15 +1000
-Subject: [PATCH 06/18] powerpc/kexec: Reset HILE before kexec_sequence
+Subject: [PATCH 05/17] powerpc/kexec: Reset HILE before kexec_sequence
 
 On powernv secondary cpus are returned to OPAL, and will then enter
 the target kernel in big-endian. However if it is set the HILE bit
diff --git a/openpower/linux/linux-0007-Revert-powerpc-Reject-binutils-2.24-when-building-li.patch b/openpower/linux/linux-0006-Revert-powerpc-Reject-binutils-2.24-when-building-li.patch
similarity index 88%
rename from openpower/linux/linux-0007-Revert-powerpc-Reject-binutils-2.24-when-building-li.patch
rename to openpower/linux/linux-0006-Revert-powerpc-Reject-binutils-2.24-when-building-li.patch
index effe6dd..580f449 100644
--- a/openpower/linux/linux-0007-Revert-powerpc-Reject-binutils-2.24-when-building-li.patch
+++ b/openpower/linux/linux-0006-Revert-powerpc-Reject-binutils-2.24-when-building-li.patch
@@ -1,7 +1,7 @@
-From 6d9584ca6de2825d7253d3e9ab075468c51dc0b1 Mon Sep 17 00:00:00 2001
+From 910ade7272f5263f2a9bcc390ffee9e825516595 Mon Sep 17 00:00:00 2001
 From: Joel Stanley <joel@jms.id.au>
 Date: Fri, 11 Sep 2015 14:43:18 +0930
-Subject: [PATCH 07/18] Revert "powerpc: Reject binutils 2.24 when building
+Subject: [PATCH 06/17] Revert "powerpc: Reject binutils 2.24 when building
  little endian"
 
 This reverts commit 60e065f70bdb0b0e916389024922ad40f3270c96.
diff --git a/openpower/linux/linux-0008-aacraid-Fix-for-LD-name-and-UID-not-exposed-to-OS.patch b/openpower/linux/linux-0007-aacraid-Fix-for-LD-name-and-UID-not-exposed-to-OS.patch
similarity index 91%
rename from openpower/linux/linux-0008-aacraid-Fix-for-LD-name-and-UID-not-exposed-to-OS.patch
rename to openpower/linux/linux-0007-aacraid-Fix-for-LD-name-and-UID-not-exposed-to-OS.patch
index 0c0ae0f..82d32c7 100644
--- a/openpower/linux/linux-0008-aacraid-Fix-for-LD-name-and-UID-not-exposed-to-OS.patch
+++ b/openpower/linux/linux-0007-aacraid-Fix-for-LD-name-and-UID-not-exposed-to-OS.patch
@@ -1,7 +1,7 @@
-From a4f608b4005ba460bf0f58297f3362b733a43424 Mon Sep 17 00:00:00 2001
+From 494f4a2d1496b3c4a9982dfb595bbd0a7997d09a Mon Sep 17 00:00:00 2001
 From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
 Date: Fri, 28 Aug 2015 06:38:33 -0400
-Subject: [PATCH 08/18] aacraid: Fix for LD name and UID not exposed to OS
+Subject: [PATCH 07/17] aacraid: Fix for LD name and UID not exposed to OS
 
 Driver sends the right size of the response buffer.
 
diff --git a/openpower/linux/linux-0009-aacraid-Add-Power-Management-support.patch b/openpower/linux/linux-0008-aacraid-Add-Power-Management-support.patch
similarity index 98%
rename from openpower/linux/linux-0009-aacraid-Add-Power-Management-support.patch
rename to openpower/linux/linux-0008-aacraid-Add-Power-Management-support.patch
index d251ae2..c0fe2b0 100644
--- a/openpower/linux/linux-0009-aacraid-Add-Power-Management-support.patch
+++ b/openpower/linux/linux-0008-aacraid-Add-Power-Management-support.patch
@@ -1,7 +1,7 @@
-From fc23728b0e620b2efef6f0cb0726070b4c26f557 Mon Sep 17 00:00:00 2001
+From 7ab8dcb7103f8f4c2ae66d6860048928a1e68f81 Mon Sep 17 00:00:00 2001
 From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
 Date: Fri, 28 Aug 2015 06:38:34 -0400
-Subject: [PATCH 09/18] aacraid: Add Power Management support
+Subject: [PATCH 08/17] aacraid: Add Power Management support
 
 * .suspend() and .resume() routines implemented in the driver
 * aac_release_resources() initiates firmware shutdown
diff --git a/openpower/linux/linux-0010-aacraid-Change-interrupt-mode-to-MSI-for-Series-6.patch b/openpower/linux/linux-0009-aacraid-Change-interrupt-mode-to-MSI-for-Series-6.patch
similarity index 93%
rename from openpower/linux/linux-0010-aacraid-Change-interrupt-mode-to-MSI-for-Series-6.patch
rename to openpower/linux/linux-0009-aacraid-Change-interrupt-mode-to-MSI-for-Series-6.patch
index 8486e1d..29662be 100644
--- a/openpower/linux/linux-0010-aacraid-Change-interrupt-mode-to-MSI-for-Series-6.patch
+++ b/openpower/linux/linux-0009-aacraid-Change-interrupt-mode-to-MSI-for-Series-6.patch
@@ -1,7 +1,7 @@
-From 6e70f88a512df5edf3483efe0495a86662e3da40 Mon Sep 17 00:00:00 2001
+From 8d5243fed049a68b887d9c6a9db821dc82ba96c2 Mon Sep 17 00:00:00 2001
 From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
 Date: Fri, 28 Aug 2015 06:38:35 -0400
-Subject: [PATCH 10/18] aacraid: Change interrupt mode to MSI for Series 6
+Subject: [PATCH 09/17] aacraid: Change interrupt mode to MSI for Series 6
 
 This change always sets MSI interrupt mode for series-6 controller.
 
diff --git a/openpower/linux/linux-0011-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch b/openpower/linux/linux-0010-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch
similarity index 98%
rename from openpower/linux/linux-0011-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch
rename to openpower/linux/linux-0010-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch
index ee50124..36d7f47 100644
--- a/openpower/linux/linux-0011-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch
+++ b/openpower/linux/linux-0010-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch
@@ -1,7 +1,7 @@
-From ab0247691fd1f2aefaacb34e5c63784946ae98e9 Mon Sep 17 00:00:00 2001
+From 6cf0c4a6a076888155b73b6273b7628e39595cff Mon Sep 17 00:00:00 2001
 From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
 Date: Fri, 28 Aug 2015 06:38:37 -0400
-Subject: [PATCH 11/18] aacraid: Tune response path if IsFastPath bit set
+Subject: [PATCH 10/17] aacraid: Tune response path if IsFastPath bit set
 
 If 'IsFastPath' bit is set, then response path assumes no error and skips error check.
 
diff --git a/openpower/linux/linux-0012-aacraid-Enable-64bit-write-to-controller-register.patch b/openpower/linux/linux-0011-aacraid-Enable-64bit-write-to-controller-register.patch
similarity index 95%
rename from openpower/linux/linux-0012-aacraid-Enable-64bit-write-to-controller-register.patch
rename to openpower/linux/linux-0011-aacraid-Enable-64bit-write-to-controller-register.patch
index 552f694..2fff3b9 100644
--- a/openpower/linux/linux-0012-aacraid-Enable-64bit-write-to-controller-register.patch
+++ b/openpower/linux/linux-0011-aacraid-Enable-64bit-write-to-controller-register.patch
@@ -1,7 +1,7 @@
-From 1bd4a123c091f8c30c62e77b37b0bab2ca575477 Mon Sep 17 00:00:00 2001
+From 619791f38bad59c663ec9f9cc0247338b5e09c12 Mon Sep 17 00:00:00 2001
 From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
 Date: Fri, 28 Aug 2015 06:38:36 -0400
-Subject: [PATCH 12/18] aacraid: Enable 64bit write to controller register
+Subject: [PATCH 11/17] aacraid: Enable 64bit write to controller register
 
 If writeq() not supported, then do atomic two 32bit write
 
diff --git a/openpower/linux/linux-0013-aacraid-IOCTL-fix.patch b/openpower/linux/linux-0012-aacraid-IOCTL-fix.patch
similarity index 91%
rename from openpower/linux/linux-0013-aacraid-IOCTL-fix.patch
rename to openpower/linux/linux-0012-aacraid-IOCTL-fix.patch
index 8581469..970b1c9 100644
--- a/openpower/linux/linux-0013-aacraid-IOCTL-fix.patch
+++ b/openpower/linux/linux-0012-aacraid-IOCTL-fix.patch
@@ -1,7 +1,7 @@
-From f87228d52a73d2f3b0443fb7b13675f5219ad45c Mon Sep 17 00:00:00 2001
+From 14307d40d8f2b7088826942bbb82fb895af3afd9 Mon Sep 17 00:00:00 2001
 From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
 Date: Fri, 28 Aug 2015 06:38:39 -0400
-Subject: [PATCH 13/18] aacraid: IOCTL fix
+Subject: [PATCH 12/17] aacraid: IOCTL fix
 
 Driver blocks ioctls once it received shutdown/suspend request during
 suspend/hybernation. This patch unblocks ioctls on resume path.
diff --git a/openpower/linux/linux-0014-aacraid-Reset-irq-affinity-hints.patch b/openpower/linux/linux-0013-aacraid-Reset-irq-affinity-hints.patch
similarity index 98%
rename from openpower/linux/linux-0014-aacraid-Reset-irq-affinity-hints.patch
rename to openpower/linux/linux-0013-aacraid-Reset-irq-affinity-hints.patch
index a915dac..387508b 100644
--- a/openpower/linux/linux-0014-aacraid-Reset-irq-affinity-hints.patch
+++ b/openpower/linux/linux-0013-aacraid-Reset-irq-affinity-hints.patch
@@ -1,7 +1,7 @@
-From 80467b536223ec4b1f7f60198036a2c66b4031c6 Mon Sep 17 00:00:00 2001
+From 07900774dd2657b26dc72718fefdaeb1fb3613fe Mon Sep 17 00:00:00 2001
 From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
 Date: Fri, 28 Aug 2015 06:38:38 -0400
-Subject: [PATCH 14/18] aacraid: Reset irq affinity hints
+Subject: [PATCH 13/17] aacraid: Reset irq affinity hints
 
 Reset irq affinity hints before releasing IRQ.
 Removed duplicate code of IRQ acquire/release.
diff --git a/openpower/linux/linux-0015-aacraid-Use-pci_enable_msix_range.patch b/openpower/linux/linux-0014-aacraid-Use-pci_enable_msix_range.patch
similarity index 94%
rename from openpower/linux/linux-0015-aacraid-Use-pci_enable_msix_range.patch
rename to openpower/linux/linux-0014-aacraid-Use-pci_enable_msix_range.patch
index bc9b8e9..7aeed9f 100644
--- a/openpower/linux/linux-0015-aacraid-Use-pci_enable_msix_range.patch
+++ b/openpower/linux/linux-0014-aacraid-Use-pci_enable_msix_range.patch
@@ -1,7 +1,7 @@
-From 4ea1fbe9d509e4c1585c40b98a233c60d7fd4e9d Mon Sep 17 00:00:00 2001
+From 08b975ea29f077eacbf6c93c069ccf6e4e4b07bd Mon Sep 17 00:00:00 2001
 From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
 Date: Fri, 28 Aug 2015 06:38:40 -0400
-Subject: [PATCH 15/18] aacraid: Use pci_enable_msix_range()
+Subject: [PATCH 14/17] aacraid: Use pci_enable_msix_range()
 
 As pci_enable_msix() deprecated, replaced with pci_enable_msix_range()
 
diff --git a/openpower/linux/linux-0016-aacraid-Update-driver-version.patch b/openpower/linux/linux-0015-aacraid-Update-driver-version.patch
similarity index 88%
rename from openpower/linux/linux-0016-aacraid-Update-driver-version.patch
rename to openpower/linux/linux-0015-aacraid-Update-driver-version.patch
index 3471475..beff003 100644
--- a/openpower/linux/linux-0016-aacraid-Update-driver-version.patch
+++ b/openpower/linux/linux-0015-aacraid-Update-driver-version.patch
@@ -1,7 +1,7 @@
-From 0a810d9f8ef10a7ee4c1ef4578bebe8118cd3946 Mon Sep 17 00:00:00 2001
+From 9f662745af7e480b02144b743d7a7f548cd5a747 Mon Sep 17 00:00:00 2001
 From: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
 Date: Fri, 28 Aug 2015 06:38:41 -0400
-Subject: [PATCH 16/18] aacraid: Update driver version
+Subject: [PATCH 15/17] aacraid: Update driver version
 
 Reviewed-by: Tomas Henzl <thenzl@redhat.com>
 Reviewed-by: Murthy Bhat <Murthy.Bhat@pmcs.com>
diff --git a/openpower/linux/linux-0017-fbcon-initialize-blink-interval-before-calling-fb_se.patch b/openpower/linux/linux-0016-fbcon-initialize-blink-interval-before-calling-fb_se.patch
similarity index 90%
rename from openpower/linux/linux-0017-fbcon-initialize-blink-interval-before-calling-fb_se.patch
rename to openpower/linux/linux-0016-fbcon-initialize-blink-interval-before-calling-fb_se.patch
index 8fb5395..27b52e8 100644
--- a/openpower/linux/linux-0017-fbcon-initialize-blink-interval-before-calling-fb_se.patch
+++ b/openpower/linux/linux-0016-fbcon-initialize-blink-interval-before-calling-fb_se.patch
@@ -1,7 +1,7 @@
-From 9c7d58df53ec5b6172b4b000423ab43fb47f1d8f Mon Sep 17 00:00:00 2001
+From fe9b91cd685ce61484091b8f1c36e19b65cda96b Mon Sep 17 00:00:00 2001
 From: Scot Doyle <lkml14@scotdoyle.com>
 Date: Fri, 9 Oct 2015 15:08:10 +0000
-Subject: [PATCH 17/18] fbcon: initialize blink interval before calling
+Subject: [PATCH 16/17] fbcon: initialize blink interval before calling
  fb_set_par
 
 Since commit 27a4c827c34ac4256a190cc9d24607f953c1c459
diff --git a/openpower/linux/linux-0018-Release-4.2.3-openpower1.patch b/openpower/linux/linux-0017-Release-4.2.4-openpower1.patch
similarity index 72%
rename from openpower/linux/linux-0018-Release-4.2.3-openpower1.patch
rename to openpower/linux/linux-0017-Release-4.2.4-openpower1.patch
index c3c7397..65dfb21 100644
--- a/openpower/linux/linux-0018-Release-4.2.3-openpower1.patch
+++ b/openpower/linux/linux-0017-Release-4.2.4-openpower1.patch
@@ -1,7 +1,7 @@
-From 6912b53d84fbc50d2905a81de907c049909b824d Mon Sep 17 00:00:00 2001
+From bf1e944d54077e1452092898069a0dacf18c381a Mon Sep 17 00:00:00 2001
 From: Joel Stanley <joel@jms.id.au>
 Date: Tue, 20 Oct 2015 15:01:06 +1030
-Subject: [PATCH 18/18] Release 4.2.3-openpower1
+Subject: [PATCH 17/17] Release 4.2.4-openpower1
 
 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 a6edbb1..7979d55 100644
+index a952801..d8175be 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 4
  PATCHLEVEL = 2
- SUBLEVEL = 3
+ SUBLEVEL = 4
 -EXTRAVERSION =
 +EXTRAVERSION = -openpower1
  NAME = Hurr durr I'ma sheep