diff --git a/buildroot b/buildroot
index 06ae8ee..f1b6fca 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit 06ae8ee75147fb08dcde6f23beb8b68f29aac43e
+Subproject commit f1b6fcafc3e82ca84505f5c16ad687b7a2d5d282
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index 2a1fa06..bdf2c77 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.4"
+BR2_LINUX_KERNEL_VERSION="4.2.5"
 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 fcc4077..3dc2f02 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -45,7 +45,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.4"
+BR2_LINUX_KERNEL_VERSION="4.2.5"
 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 1208a80..1713606 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.4"
+BR2_LINUX_KERNEL_VERSION="4.2.5"
 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 1adf52d..6f29cc8 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.4"
+BR2_LINUX_KERNEL_VERSION="4.2.5"
 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 0d89b07..1b343a2 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.4"
+BR2_LINUX_KERNEL_VERSION="4.2.5"
 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 8ce8b7f..3dfb56e 100644
--- a/openpower/linux/linux-0001-powerpc-Add-openpower_defconfig.patch
+++ b/openpower/linux/linux-0001-powerpc-Add-openpower_defconfig.patch
@@ -1,4 +1,4 @@
-From 70f789b86a2daaa88e89d11e1e4c726f110094e7 Mon Sep 17 00:00:00 2001
+From 3700065f5c1b076e49aa81eff729012fd2da6b54 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/17] powerpc: Add openpower_defconfig
diff --git a/openpower/linux/linux-0002-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
index f3d1f88..b97fe3d 100644
--- a/openpower/linux/linux-0002-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,4 +1,4 @@
-From 8880fc2d44e538e4806780afc76437e844126da9 Mon Sep 17 00:00:00 2001
+From bb607985cc1eec5693851dd68af1ab0a87986ec5 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 02/17] xhci: Use xhci_pci_remove for xhci device shutdown
diff --git a/openpower/linux/linux-0003-drm-ast-Default-to-8bpp-on-big-endian.patch b/openpower/linux/linux-0003-drm-ast-Default-to-8bpp-on-big-endian.patch
index 3427346..c163f4d 100644
--- a/openpower/linux/linux-0003-drm-ast-Default-to-8bpp-on-big-endian.patch
+++ b/openpower/linux/linux-0003-drm-ast-Default-to-8bpp-on-big-endian.patch
@@ -1,4 +1,4 @@
-From 3974f00104e399e91a0ab0f4b0f5e26e1f5e2ff9 Mon Sep 17 00:00:00 2001
+From 962e22b1eb505a50671f47b62d52c7d23acf69f3 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 03/17] drm/ast: Default to 8bpp on big endian
diff --git a/openpower/linux/linux-0004-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch b/openpower/linux/linux-0004-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch
index fc1bd5f..48c89a8 100644
--- a/openpower/linux/linux-0004-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch
+++ b/openpower/linux/linux-0004-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch
@@ -1,4 +1,4 @@
-From 8bd51183220742ce12d4c231d8a2cff13df796c4 Mon Sep 17 00:00:00 2001
+From 7d09146cc906efed651f227864c8603fc57ee325 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 04/17] powerpc/kexec: Reset secondary cpu endianess before
diff --git a/openpower/linux/linux-0005-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch b/openpower/linux/linux-0005-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch
index ac3f985..05e884d 100644
--- a/openpower/linux/linux-0005-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch
+++ b/openpower/linux/linux-0005-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch
@@ -1,4 +1,4 @@
-From 051c24b3c8b32db05e575e29c3a9d66c924e4bfc Mon Sep 17 00:00:00 2001
+From 67b97ec555099b7f84cd98c6f8e93cac588aa830 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 05/17] powerpc/kexec: Reset HILE before kexec_sequence
diff --git a/openpower/linux/linux-0006-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
index 580f449..3968fbc 100644
--- a/openpower/linux/linux-0006-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,4 +1,4 @@
-From 910ade7272f5263f2a9bcc390ffee9e825516595 Mon Sep 17 00:00:00 2001
+From a24b6a40ae28997b8543b5912dbcb69be94c3e69 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 06/17] Revert "powerpc: Reject binutils 2.24 when building
diff --git a/openpower/linux/linux-0007-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
index 82d32c7..0137c0b 100644
--- a/openpower/linux/linux-0007-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,4 +1,4 @@
-From 494f4a2d1496b3c4a9982dfb595bbd0a7997d09a Mon Sep 17 00:00:00 2001
+From 6e9462ff5c5a1a4acdea277a8a5ba5c82c287b62 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 07/17] aacraid: Fix for LD name and UID not exposed to OS
diff --git a/openpower/linux/linux-0008-aacraid-Add-Power-Management-support.patch b/openpower/linux/linux-0008-aacraid-Add-Power-Management-support.patch
index c0fe2b0..d0b5a34 100644
--- a/openpower/linux/linux-0008-aacraid-Add-Power-Management-support.patch
+++ b/openpower/linux/linux-0008-aacraid-Add-Power-Management-support.patch
@@ -1,4 +1,4 @@
-From 7ab8dcb7103f8f4c2ae66d6860048928a1e68f81 Mon Sep 17 00:00:00 2001
+From 608f633800ba170ccdcaf8797fce5787f038eefb 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 08/17] aacraid: Add Power Management support
diff --git a/openpower/linux/linux-0009-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
index 29662be..f7443a7 100644
--- a/openpower/linux/linux-0009-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,4 +1,4 @@
-From 8d5243fed049a68b887d9c6a9db821dc82ba96c2 Mon Sep 17 00:00:00 2001
+From 9b99db2b1e54238f98477cdad37dba34731792be 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 09/17] aacraid: Change interrupt mode to MSI for Series 6
diff --git a/openpower/linux/linux-0010-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch b/openpower/linux/linux-0010-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch
index 36d7f47..6b00b29 100644
--- a/openpower/linux/linux-0010-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch
+++ b/openpower/linux/linux-0010-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch
@@ -1,4 +1,4 @@
-From 6cf0c4a6a076888155b73b6273b7628e39595cff Mon Sep 17 00:00:00 2001
+From 841c01b02751a163bd66ab6ad0c5b7b7e147b47d 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 10/17] aacraid: Tune response path if IsFastPath bit set
diff --git a/openpower/linux/linux-0011-aacraid-Enable-64bit-write-to-controller-register.patch b/openpower/linux/linux-0011-aacraid-Enable-64bit-write-to-controller-register.patch
index 2fff3b9..7215274 100644
--- a/openpower/linux/linux-0011-aacraid-Enable-64bit-write-to-controller-register.patch
+++ b/openpower/linux/linux-0011-aacraid-Enable-64bit-write-to-controller-register.patch
@@ -1,4 +1,4 @@
-From 619791f38bad59c663ec9f9cc0247338b5e09c12 Mon Sep 17 00:00:00 2001
+From a7aac5e60943c0d40f2b7d9ce0a6462e4479800d 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 11/17] aacraid: Enable 64bit write to controller register
diff --git a/openpower/linux/linux-0012-aacraid-IOCTL-fix.patch b/openpower/linux/linux-0012-aacraid-IOCTL-fix.patch
index 970b1c9..f4057e3 100644
--- a/openpower/linux/linux-0012-aacraid-IOCTL-fix.patch
+++ b/openpower/linux/linux-0012-aacraid-IOCTL-fix.patch
@@ -1,4 +1,4 @@
-From 14307d40d8f2b7088826942bbb82fb895af3afd9 Mon Sep 17 00:00:00 2001
+From 97d883832a9083aad13b736b2e513307edd1216d 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 12/17] aacraid: IOCTL fix
diff --git a/openpower/linux/linux-0013-aacraid-Reset-irq-affinity-hints.patch b/openpower/linux/linux-0013-aacraid-Reset-irq-affinity-hints.patch
index 387508b..d32e6fb 100644
--- a/openpower/linux/linux-0013-aacraid-Reset-irq-affinity-hints.patch
+++ b/openpower/linux/linux-0013-aacraid-Reset-irq-affinity-hints.patch
@@ -1,4 +1,4 @@
-From 07900774dd2657b26dc72718fefdaeb1fb3613fe Mon Sep 17 00:00:00 2001
+From 39231523523eadf49e7cc88426dfebc1bf3fcfbe 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 13/17] aacraid: Reset irq affinity hints
diff --git a/openpower/linux/linux-0014-aacraid-Use-pci_enable_msix_range.patch b/openpower/linux/linux-0014-aacraid-Use-pci_enable_msix_range.patch
index 7aeed9f..41c281b 100644
--- a/openpower/linux/linux-0014-aacraid-Use-pci_enable_msix_range.patch
+++ b/openpower/linux/linux-0014-aacraid-Use-pci_enable_msix_range.patch
@@ -1,4 +1,4 @@
-From 08b975ea29f077eacbf6c93c069ccf6e4e4b07bd Mon Sep 17 00:00:00 2001
+From f0b1e9c3d16c488ef8a92e87c99bdd30ea7c3f11 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 14/17] aacraid: Use pci_enable_msix_range()
diff --git a/openpower/linux/linux-0015-aacraid-Update-driver-version.patch b/openpower/linux/linux-0015-aacraid-Update-driver-version.patch
index beff003..a815580 100644
--- a/openpower/linux/linux-0015-aacraid-Update-driver-version.patch
+++ b/openpower/linux/linux-0015-aacraid-Update-driver-version.patch
@@ -1,4 +1,4 @@
-From 9f662745af7e480b02144b743d7a7f548cd5a747 Mon Sep 17 00:00:00 2001
+From 89253aff92b94764266fad985ef25103836575d0 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 15/17] aacraid: Update driver version
diff --git a/openpower/linux/linux-0016-fbcon-initialize-blink-interval-before-calling-fb_se.patch b/openpower/linux/linux-0016-fbcon-initialize-blink-interval-before-calling-fb_se.patch
index 27b52e8..ff76e76 100644
--- a/openpower/linux/linux-0016-fbcon-initialize-blink-interval-before-calling-fb_se.patch
+++ b/openpower/linux/linux-0016-fbcon-initialize-blink-interval-before-calling-fb_se.patch
@@ -1,4 +1,4 @@
-From fe9b91cd685ce61484091b8f1c36e19b65cda96b Mon Sep 17 00:00:00 2001
+From a9f6fe770be903195109d0839f8192052859251d Mon Sep 17 00:00:00 2001
 From: Scot Doyle <lkml14@scotdoyle.com>
 Date: Fri, 9 Oct 2015 15:08:10 +0000
 Subject: [PATCH 16/17] fbcon: initialize blink interval before calling
diff --git a/openpower/linux/linux-0017-Release-4.2.4-openpower1.patch b/openpower/linux/linux-0017-Release-4.2.5-openpower1.patch
similarity index 72%
rename from openpower/linux/linux-0017-Release-4.2.4-openpower1.patch
rename to openpower/linux/linux-0017-Release-4.2.5-openpower1.patch
index 65dfb21..13e5a90 100644
--- a/openpower/linux/linux-0017-Release-4.2.4-openpower1.patch
+++ b/openpower/linux/linux-0017-Release-4.2.5-openpower1.patch
@@ -1,7 +1,7 @@
-From bf1e944d54077e1452092898069a0dacf18c381a Mon Sep 17 00:00:00 2001
+From b9e362ebebec9d427afd0bf21b1e370929736785 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 17/17] Release 4.2.4-openpower1
+Subject: [PATCH 17/17] Release 4.2.5-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 a952801..d8175be 100644
+index 96076dc..e6d6eac2 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 4
  PATCHLEVEL = 2
- SUBLEVEL = 4
+ SUBLEVEL = 5
 -EXTRAVERSION =
 +EXTRAVERSION = -openpower1
  NAME = Hurr durr I'ma sheep