linux: update to v4.2.3-openpower1

 - Dropped 'net/bnx2x: Add shutdown handler' as this is upstream
 - Added 'fbcon: initialize blink interval before calling fb_set_par'
 - Rebased on v4.2.3 stable release

Signed-off-by: Joel Stanley <joel@jms.id.au>

21 files changed, 94 insertions, 120 deletions

diff --git a/openpower/linux/linux-0001-powerpc-Add-openpower_defconfig.patch b/openpower/linux/linux-0001-powerpc-Add-openpower_defconfig.patch
index 970a6dc5..5d2a3172 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 359e321ac2e989d5a1b9810f3c1e54bc4971c331 Mon Sep 17 00:00:00 2001
+From 2dd6f872aa2c1731e0c04b22654ee46d831626d0 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
@@ -8,10 +8,6 @@ configuration used by the op-build openpower buildroot overlay.
 
 Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
 Signed-off-by: Joel Stanley <joel@jms.id.au>
-
-add accraid
-
-Signed-off-by: Joel Stanley <joel@jms.id.au>
 ---
  arch/powerpc/configs/openpower_defconfig | 217 +++++++++++++++++++++++++++++++
  1 file changed, 217 insertions(+)
diff --git a/openpower/linux/linux-0002-net-bnx2x-Add-shutdown-handler.patch b/openpower/linux/linux-0002-net-bnx2x-Add-shutdown-handler.patch
deleted file mode 100644
index 8fbb009f..00000000
--- a/openpower/linux/linux-0002-net-bnx2x-Add-shutdown-handler.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1f3e4395adc3b9f1d2ec088dd18e88a6fc89330d Mon Sep 17 00:00:00 2001
-From: Jeremy Kerr <jk@ozlabs.org>
-Date: Fri, 7 Mar 2014 10:17:22 +0800
-Subject: [PATCH 02/18] net/bnx2x: Add shutdown handler
-
-This change uses the existing .remove handler for device shutdown.
-
-Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
-Signed-off-by: Joel Stanley <joel@jms.id.au>
----
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
-index c27af12..d08fd26 100644
---- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
-+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
-@@ -13906,6 +13906,7 @@ static struct pci_driver bnx2x_pci_driver = {
- 	.name        = DRV_MODULE_NAME,
- 	.id_table    = bnx2x_pci_tbl,
- 	.probe       = bnx2x_init_one,
-+	.shutdown    = bnx2x_remove_one,
- 	.remove      = bnx2x_remove_one,
- 	.suspend     = bnx2x_suspend,
- 	.resume      = bnx2x_resume,
--- 
-2.5.0
-
diff --git a/openpower/linux/linux-0003-xhci-do-not-halt-the-secondary-HCD.patch b/openpower/linux/linux-0002-xhci-do-not-halt-the-secondary-HCD.patch
index b8030c35..c78bf747 100644
--- a/openpower/linux/linux-0003-xhci-do-not-halt-the-secondary-HCD.patch
+++ b/openpower/linux/linux-0002-xhci-do-not-halt-the-secondary-HCD.patch
@@ -1,7 +1,7 @@
-From a8538355237e20fe0a0b204ca67465350701f98c Mon Sep 17 00:00:00 2001
+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 03/18] xhci: do not halt the secondary HCD
+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
diff --git a/openpower/linux/linux-0004-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch b/openpower/linux/linux-0003-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
index 687622ec..ac021e12 100644
--- a/openpower/linux/linux-0004-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
+++ b/openpower/linux/linux-0003-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
@@ -1,7 +1,7 @@
-From 179982a2b95c1151ecca72cbe3c74464d2852e10 Mon Sep 17 00:00:00 2001
+From 12b16e15e73c624f06ab721db8b796b654c3a0c9 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 04/18] xhci: Use xhci_pci_remove for xhci device shutdown
+Subject: [PATCH 03/18] 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>
diff --git a/openpower/linux/linux-0005-drm-ast-Default-to-8bpp-on-big-endian.patch b/openpower/linux/linux-0004-drm-ast-Default-to-8bpp-on-big-endian.patch
index 205e1f65..3d491666 100644
--- a/openpower/linux/linux-0005-drm-ast-Default-to-8bpp-on-big-endian.patch
+++ b/openpower/linux/linux-0004-drm-ast-Default-to-8bpp-on-big-endian.patch
@@ -1,7 +1,7 @@
-From bea892898f5fe11ac0c24404db59d3ade6981b9e Mon Sep 17 00:00:00 2001
+From a5be24c34d70c16b65c3a68d8becd04fdbfd5300 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 05/18] drm/ast: Default to 8bpp on big endian
+Subject: [PATCH 04/18] 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-0006-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch b/openpower/linux/linux-0005-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch
index 1754ea41..f4ba919d 100644
--- a/openpower/linux/linux-0006-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch
+++ b/openpower/linux/linux-0005-powerpc-kexec-Reset-secondary-cpu-endianess-before-k.patch
@@ -1,7 +1,7 @@
-From 2d2ab23cbdbbb1907f1f34085c3904efe1979df0 Mon Sep 17 00:00:00 2001
+From be50ab4cae5557c5df79c347e75e2eb4ce71cd6f 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 06/18] powerpc/kexec: Reset secondary cpu endianess before
+Subject: [PATCH 05/18] 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-0007-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch b/openpower/linux/linux-0006-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch
index 66f59b41..95411b4a 100644
--- a/openpower/linux/linux-0007-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch
+++ b/openpower/linux/linux-0006-powerpc-kexec-Reset-HILE-before-kexec_sequence.patch
@@ -1,7 +1,7 @@
-From b7d553c5fce6888aa29a19627b20d9f34d0aee57 Mon Sep 17 00:00:00 2001
+From 2359429f4bd73ceaef1747320032ce1831fa49a4 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 07/18] powerpc/kexec: Reset HILE before kexec_sequence
+Subject: [PATCH 06/18] 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-0008-Revert-powerpc-Reject-binutils-2.24-when-building-li.patch b/openpower/linux/linux-0007-Revert-powerpc-Reject-binutils-2.24-when-building-li.patch
index 5dda6313..effe6dd2 100644
--- a/openpower/linux/linux-0008-Revert-powerpc-Reject-binutils-2.24-when-building-li.patch
+++ b/openpower/linux/linux-0007-Revert-powerpc-Reject-binutils-2.24-when-building-li.patch
@@ -1,7 +1,7 @@
-From 6e423929667756362eec6155eb371843c6e65038 Mon Sep 17 00:00:00 2001
+From 6d9584ca6de2825d7253d3e9ab075468c51dc0b1 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 08/18] Revert "powerpc: Reject binutils 2.24 when building
+Subject: [PATCH 07/18] Revert "powerpc: Reject binutils 2.24 when building
  little endian"
 
 This reverts commit 60e065f70bdb0b0e916389024922ad40f3270c96.
diff --git a/openpower/linux/linux-0009-aacraid-Fix-for-LD-name-and-UID-not-exposed-to-OS.patch b/openpower/linux/linux-0008-aacraid-Fix-for-LD-name-and-UID-not-exposed-to-OS.patch
index e9950d5d..0c0ae0f2 100644
--- a/openpower/linux/linux-0009-aacraid-Fix-for-LD-name-and-UID-not-exposed-to-OS.patch
+++ b/openpower/linux/linux-0008-aacraid-Fix-for-LD-name-and-UID-not-exposed-to-OS.patch
@@ -1,7 +1,7 @@
-From 317f2be52fd70c80cc5e421f08d6e229552d096c Mon Sep 17 00:00:00 2001
+From a4f608b4005ba460bf0f58297f3362b733a43424 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 09/18] aacraid: Fix for LD name and UID not exposed to OS
+Subject: [PATCH 08/18] 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-0010-aacraid-Add-Power-Management-support.patch b/openpower/linux/linux-0009-aacraid-Add-Power-Management-support.patch
index 32e39f7f..d251ae2e 100644
--- a/openpower/linux/linux-0010-aacraid-Add-Power-Management-support.patch
+++ b/openpower/linux/linux-0009-aacraid-Add-Power-Management-support.patch
@@ -1,7 +1,7 @@
-From b39c80fbb42cfca6766807c2f846c4d77dae0fa7 Mon Sep 17 00:00:00 2001
+From fc23728b0e620b2efef6f0cb0726070b4c26f557 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 10/18] aacraid: Add Power Management support
+Subject: [PATCH 09/18] 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-0011-aacraid-Change-interrupt-mode-to-MSI-for-Series-6.patch b/openpower/linux/linux-0010-aacraid-Change-interrupt-mode-to-MSI-for-Series-6.patch
index 1ed4ef94..8486e1d0 100644
--- a/openpower/linux/linux-0011-aacraid-Change-interrupt-mode-to-MSI-for-Series-6.patch
+++ b/openpower/linux/linux-0010-aacraid-Change-interrupt-mode-to-MSI-for-Series-6.patch
@@ -1,7 +1,7 @@
-From d9ba7aa29b0b509f955fc699e2cc46586350cc70 Mon Sep 17 00:00:00 2001
+From 6e70f88a512df5edf3483efe0495a86662e3da40 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 11/18] aacraid: Change interrupt mode to MSI for Series 6
+Subject: [PATCH 10/18] 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-0012-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch b/openpower/linux/linux-0011-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch
index f4069acd..ee50124d 100644
--- a/openpower/linux/linux-0012-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch
+++ b/openpower/linux/linux-0011-aacraid-Tune-response-path-if-IsFastPath-bit-set.patch
@@ -1,7 +1,7 @@
-From 3347b9a251462899045c322ff17a8b6b69ec6bc2 Mon Sep 17 00:00:00 2001
+From ab0247691fd1f2aefaacb34e5c63784946ae98e9 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 12/18] aacraid: Tune response path if IsFastPath bit set
+Subject: [PATCH 11/18] 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-0013-aacraid-Enable-64bit-write-to-controller-register.patch b/openpower/linux/linux-0012-aacraid-Enable-64bit-write-to-controller-register.patch
index c0fb3d25..552f6948 100644
--- a/openpower/linux/linux-0013-aacraid-Enable-64bit-write-to-controller-register.patch
+++ b/openpower/linux/linux-0012-aacraid-Enable-64bit-write-to-controller-register.patch
@@ -1,7 +1,7 @@
-From e778c7f7ca05f9abad4d590e3979b3c3970cfd26 Mon Sep 17 00:00:00 2001
+From 1bd4a123c091f8c30c62e77b37b0bab2ca575477 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 13/18] aacraid: Enable 64bit write to controller register
+Subject: [PATCH 12/18] aacraid: Enable 64bit write to controller register
 
 If writeq() not supported, then do atomic two 32bit write
 
diff --git a/openpower/linux/linux-0014-aacraid-IOCTL-fix.patch b/openpower/linux/linux-0013-aacraid-IOCTL-fix.patch
index 6faddc87..85814695 100644
--- a/openpower/linux/linux-0014-aacraid-IOCTL-fix.patch
+++ b/openpower/linux/linux-0013-aacraid-IOCTL-fix.patch
@@ -1,7 +1,7 @@
-From 892fadaa9806538ae2c419449c66f4c2838fff2d Mon Sep 17 00:00:00 2001
+From f87228d52a73d2f3b0443fb7b13675f5219ad45c 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 14/18] aacraid: IOCTL fix
+Subject: [PATCH 13/18] 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-0015-aacraid-Reset-irq-affinity-hints.patch b/openpower/linux/linux-0014-aacraid-Reset-irq-affinity-hints.patch
index e9d6d9da..a915dac8 100644
--- a/openpower/linux/linux-0015-aacraid-Reset-irq-affinity-hints.patch
+++ b/openpower/linux/linux-0014-aacraid-Reset-irq-affinity-hints.patch
@@ -1,7 +1,7 @@
-From 81d42e7a457e420041f27b97efdfc6176647876a Mon Sep 17 00:00:00 2001
+From 80467b536223ec4b1f7f60198036a2c66b4031c6 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 15/18] aacraid: Reset irq affinity hints
+Subject: [PATCH 14/18] 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-0016-aacraid-Use-pci_enable_msix_range.patch b/openpower/linux/linux-0015-aacraid-Use-pci_enable_msix_range.patch
index b3ba2061..bc9b8e97 100644
--- a/openpower/linux/linux-0016-aacraid-Use-pci_enable_msix_range.patch
+++ b/openpower/linux/linux-0015-aacraid-Use-pci_enable_msix_range.patch
@@ -1,7 +1,7 @@
-From e27d0ec1620e6c79a1cfe7286ad142f6c0701011 Mon Sep 17 00:00:00 2001
+From 4ea1fbe9d509e4c1585c40b98a233c60d7fd4e9d 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 16/18] aacraid: Use pci_enable_msix_range()
+Subject: [PATCH 15/18] aacraid: Use pci_enable_msix_range()
 
 As pci_enable_msix() deprecated, replaced with pci_enable_msix_range()
 
diff --git a/openpower/linux/linux-0017-aacraid-Update-driver-version.patch b/openpower/linux/linux-0016-aacraid-Update-driver-version.patch
index 09345a3f..34714753 100644
--- a/openpower/linux/linux-0017-aacraid-Update-driver-version.patch
+++ b/openpower/linux/linux-0016-aacraid-Update-driver-version.patch
@@ -1,7 +1,7 @@
-From f11a9348cf2abcc11bc1b98a9976d73107df88b0 Mon Sep 17 00:00:00 2001
+From 0a810d9f8ef10a7ee4c1ef4578bebe8118cd3946 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 17/18] aacraid: Update driver version
+Subject: [PATCH 16/18] 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-0017-fbcon-initialize-blink-interval-before-calling-fb_se.patch
new file mode 100644
index 00000000..8fb53953
--- /dev/null
+++ b/openpower/linux/linux-0017-fbcon-initialize-blink-interval-before-calling-fb_se.patch
@@ -0,0 +1,37 @@
+From 9c7d58df53ec5b6172b4b000423ab43fb47f1d8f 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
+ fb_set_par
+
+Since commit 27a4c827c34ac4256a190cc9d24607f953c1c459
+    fbcon: use the cursor blink interval provided by vt
+
+a PPC64LE kernel fails to boot when fbcon_add_cursor_timer uses an
+uninitialized ops->cur_blink_jiffies. Prevent by initializing
+in fbcon_init before the call to info->fbops->fb_set_par.
+
+Reported-and-tested-by: Alistair Popple <alistair@popple.id.au>
+Signed-off-by: Scot Doyle <lkml14@scotdoyle.com>
+Cc: <stable@vger.kernel.org> [v4.2]
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+---
+ drivers/video/console/fbcon.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
+index 1aaf893..92f3949 100644
+--- a/drivers/video/console/fbcon.c
++++ b/drivers/video/console/fbcon.c
+@@ -1093,6 +1093,7 @@ static void fbcon_init(struct vc_data *vc, int init)
+ 		con_copy_unimap(vc, svc);
+ 
+ 	ops = info->fbcon_par;
++	ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
+ 	p->con_rotate = initial_rotation;
+ 	set_blitting_type(vc, info);
+ 
+-- 
+2.5.0
+
diff --git a/openpower/linux/linux-0018-Fix-crash-in-ast-fbcon-on-boot.patch b/openpower/linux/linux-0018-Fix-crash-in-ast-fbcon-on-boot.patch
deleted file mode 100644
index 5e55969b..00000000
--- a/openpower/linux/linux-0018-Fix-crash-in-ast-fbcon-on-boot.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d56cf122d12632a0015e19778a71c88f80799227 Mon Sep 17 00:00:00 2001
-From: Stewart Smith <stewart@linux.vnet.ibm.com>
-Date: Sat, 3 Oct 2015 11:02:31 +1000
-Subject: [PATCH 1/2] Fix crash in ast fbcon on boot
-
-theory is ops->cur_blink_jiffies is not getting initialised before adding
-the timer
-
-Reported-by: Stephanie M Swanson <swanman@us.ibm.com>
-Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
----
- drivers/video/console/fbcon.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
-index 1aaf893..45d2a0a 100644
---- a/drivers/video/console/fbcon.c
-+++ b/drivers/video/console/fbcon.c
-@@ -416,6 +416,8 @@ static void fbcon_add_cursor_timer(struct fb_info *info)
- 			INIT_WORK(&info->queue, fb_flashcursor);
- 
- 		init_timer(&ops->cursor_timer);
-+		if (ops->cur_blink_jiffies < 1)
-+			ops->cur_blink_jiffies = msecs_to_jiffies(200);
- 		ops->cursor_timer.function = cursor_timer_handler;
- 		ops->cursor_timer.expires = jiffies + ops->cur_blink_jiffies;
- 		ops->cursor_timer.data = (unsigned long ) info;
--- 
-1.7.1
-
diff --git a/openpower/linux/linux-0018-Release-4.2.3-openpower1.patch b/openpower/linux/linux-0018-Release-4.2.3-openpower1.patch
new file mode 100644
index 00000000..c3c7397d
--- /dev/null
+++ b/openpower/linux/linux-0018-Release-4.2.3-openpower1.patch
@@ -0,0 +1,26 @@
+From 6912b53d84fbc50d2905a81de907c049909b824d 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
+
+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 a6edbb1..7979d55 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 4
+ PATCHLEVEL = 2
+ SUBLEVEL = 3
+-EXTRAVERSION =
++EXTRAVERSION = -openpower1
+ NAME = Hurr durr I'ma sheep
+ 
+ # *DOCUMENTATION*
+-- 
+2.5.0
+
diff --git a/openpower/linux/linux-0019-Release-4.2.1-openpower2.patch b/openpower/linux/linux-0019-Release-4.2.1-openpower2.patch
deleted file mode 100644
index 2e0e8476..00000000
--- a/openpower/linux/linux-0019-Release-4.2.1-openpower2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 185b564ab788e84bb7b07482f7fdbb816b209b46 Mon Sep 17 00:00:00 2001
-From: Stewart Smith <stewart@linux.vnet.ibm.com>
-Date: Sat, 3 Oct 2015 11:07:20 +1000
-Subject: [PATCH 2/2] Release 4.2.1-openpower2
-
-Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
----
- Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index a03efc1..ca21a06 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 4
- PATCHLEVEL = 2
- SUBLEVEL = 1
--EXTRAVERSION =
-+EXTRAVERSION = -openpower2
- NAME = Hurr durr I'ma sheep
- 
- # *DOCUMENTATION*
--- 
-1.7.1
-