Merge pull request #660 from stewart-ibm/op-build-1.10.y
STABLE: Release 4.4.22-openpower1
diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig
index 8d467d8..06d9158 100644
--- a/openpower/configs/barreleye_defconfig
+++ b/openpower/configs/barreleye_defconfig
@@ -42,7 +42,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.22"
BR2_KERNEL_HEADERS_4_4=y
BR2_BINUTILS_VERSION_2_26_X=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig
index 8953278..08f3c7c 100644
--- a/openpower/configs/firenze_defconfig
+++ b/openpower/configs/firenze_defconfig
@@ -39,7 +39,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firenze-firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.22"
BR2_KERNEL_HEADERS_4_4=y
BR2_BINUTILS_VERSION_2_26_X=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index f0dcb16..0c501d2 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -42,7 +42,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.22"
BR2_KERNEL_HEADERS_4_4=y
BR2_BINUTILS_VERSION_2_26_X=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index 9491ba0..cb02539 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -46,7 +46,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.22"
BR2_KERNEL_HEADERS_4_4=y
BR2_BINUTILS_VERSION_2_26_X=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index dfca7b4..2c1b74e 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -42,7 +42,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.22"
BR2_KERNEL_HEADERS_4_4=y
BR2_BINUTILS_VERSION_2_26_X=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig
index 3613d42..bf350de 100644
--- a/openpower/configs/openpower_mambo_defconfig
+++ b/openpower/configs/openpower_mambo_defconfig
@@ -31,7 +31,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.22"
BR2_KERNEL_HEADERS_4_4=y
BR2_BINUTILS_VERSION_2_26_X=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index 06cc2e8..40594d6 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -40,7 +40,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.22"
BR2_KERNEL_HEADERS_4_4=y
BR2_BINUTILS_VERSION_2_26_X=y
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
diff --git a/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch b/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
index 6a0865d..ea35833 100644
--- a/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
+++ b/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
@@ -1,4 +1,4 @@
-From 8cc1999f23b5a63abde5520b043f04c1cce2160f Mon Sep 17 00:00:00 2001
+From 9115015f795489d8b40dec2996347f621f3f0369 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 1/9] xhci: Use xhci_pci_remove for xhci device shutdown
diff --git a/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch b/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
index 4ee6c70..77599ee 100644
--- a/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
+++ b/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
@@ -1,4 +1,4 @@
-From 1bb5c96e14feb939411bcc8d53c6a85aefc3e533 Mon Sep 17 00:00:00 2001
+From cbacaf83ae6999a6b8f517b8057166f20b3c7163 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Wed, 2 Mar 2016 11:25:47 +0800
Subject: [PATCH 2/9] drivers/drm/ast: Switch SCU to VGA output on POST
diff --git a/openpower/linux/0003-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch b/openpower/linux/0003-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
index b9f1ead..4ac8db9 100644
--- a/openpower/linux/0003-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
+++ b/openpower/linux/0003-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
@@ -1,4 +1,4 @@
-From 3f7163e7654266b8315d5492397c305c47042854 Mon Sep 17 00:00:00 2001
+From dec87cf338f81b8d6bf44a46c1aa699d6402a172 Mon Sep 17 00:00:00 2001
From: Huy Nguyen <huyn@mellanox.com>
Date: Wed, 17 Feb 2016 17:24:26 +0200
Subject: [PATCH 3/9] net/mlx4_core: Set UAR page size to 4KB regardless of
diff --git a/openpower/linux/0004-xhci-do-not-halt-the-secondary-HCD.patch b/openpower/linux/0004-xhci-do-not-halt-the-secondary-HCD.patch
index 4497720..907631a 100644
--- a/openpower/linux/0004-xhci-do-not-halt-the-secondary-HCD.patch
+++ b/openpower/linux/0004-xhci-do-not-halt-the-secondary-HCD.patch
@@ -1,4 +1,4 @@
-From 99b0645ed21b4006db3ac585df59e693cdff9745 Mon Sep 17 00:00:00 2001
+From 53b3e6be5203d2f484c265707f6f6547549c7cbf Mon Sep 17 00:00:00 2001
From: Joel Stanley <joel@jms.id.au>
Date: Tue, 19 Jul 2016 22:43:26 +0930
Subject: [PATCH 4/9] xhci: do not halt the secondary HCD
diff --git a/openpower/linux/0005-net-mlx5-Add-pci-shutdown-callback.patch b/openpower/linux/0005-net-mlx5-Add-pci-shutdown-callback.patch
index e0cdebf..5811db6 100644
--- a/openpower/linux/0005-net-mlx5-Add-pci-shutdown-callback.patch
+++ b/openpower/linux/0005-net-mlx5-Add-pci-shutdown-callback.patch
@@ -1,4 +1,4 @@
-From 9b8c728c52bb85f99a474cd8f20c2d8505c196a9 Mon Sep 17 00:00:00 2001
+From 2b826400b15799efbaf4022c60c0304d0f149fdf Mon Sep 17 00:00:00 2001
From: Carol L Soto <clsoto@linux.vnet.ibm.com>
Date: Tue, 12 Jul 2016 17:04:07 -0500
Subject: [PATCH 5/9] net/mlx5: Add pci shutdown callback
diff --git a/openpower/linux/0006-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch b/openpower/linux/0006-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch
index 4f32293..440f05f 100644
--- a/openpower/linux/0006-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch
+++ b/openpower/linux/0006-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch
@@ -1,4 +1,4 @@
-From 67e7ea6c561c50a7a07fe526ce036fc1a27a201d Mon Sep 17 00:00:00 2001
+From 9bef7237a339c2f017a3927565b7fe2a84949019 Mon Sep 17 00:00:00 2001
From: Oliver O'Halloran <oohall@gmail.com>
Date: Fri, 24 Jun 2016 17:28:43 +1000
Subject: [PATCH 6/9] powerpc/boot: Add OPAL console to epapr wrappers
diff --git a/openpower/linux/0007-tty-hvc-Use-opal-irqchip-interface-if-available.patch b/openpower/linux/0007-tty-hvc-Use-opal-irqchip-interface-if-available.patch
index d62adb5..02a6c26 100644
--- a/openpower/linux/0007-tty-hvc-Use-opal-irqchip-interface-if-available.patch
+++ b/openpower/linux/0007-tty-hvc-Use-opal-irqchip-interface-if-available.patch
@@ -1,4 +1,4 @@
-From 2d69ffcf74ecc917a4cb3efdb0f29b466658ddd7 Mon Sep 17 00:00:00 2001
+From 06ce823342d939bdb2466691afcaeea64a4de964 Mon Sep 17 00:00:00 2001
From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Date: Wed, 13 Jul 2016 11:15:42 +1000
Subject: [PATCH 7/9] tty/hvc: Use opal irqchip interface if available
diff --git a/openpower/linux/0008-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch b/openpower/linux/0008-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch
index 598c4cf..80e21e7 100644
--- a/openpower/linux/0008-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch
+++ b/openpower/linux/0008-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch
@@ -1,4 +1,4 @@
-From c0ac5e0b28b06cdce529004cf8bd0516b6fd7bb9 Mon Sep 17 00:00:00 2001
+From 541e65e116602fcd155d279f8e2313b0d60c9731 Mon Sep 17 00:00:00 2001
From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Date: Wed, 13 Jul 2016 11:15:41 +1000
Subject: [PATCH 8/9] tty/hvc: Use IRQF_SHARED for OPAL hvc consoles
diff --git a/openpower/linux/0009-Release-4.4.21-openpower1.patch b/openpower/linux/0009-Release-4.4.22-openpower1.patch
similarity index 70%
rename from openpower/linux/0009-Release-4.4.21-openpower1.patch
rename to openpower/linux/0009-Release-4.4.22-openpower1.patch
index 6581d87..f80ea02 100644
--- a/openpower/linux/0009-Release-4.4.21-openpower1.patch
+++ b/openpower/linux/0009-Release-4.4.22-openpower1.patch
@@ -1,7 +1,7 @@
-From ad9783190cc44791091c601950b712d2a546ea14 Mon Sep 17 00:00:00 2001
+From 5bea769e2f76a69153b0b830fce80e0745b5f59b Mon Sep 17 00:00:00 2001
From: Joel Stanley <joel@jms.id.au>
Date: Tue, 16 Aug 2016 23:00:23 +0930
-Subject: [PATCH 9/9] Release 4.4.21-openpower1
+Subject: [PATCH 9/9] Release 4.4.22-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 d1cc9e0b7473..4611fd8ba2ae 100644
+index a6512f4eec9f..3876a2c87c56 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 4
PATCHLEVEL = 4
- SUBLEVEL = 21
+ SUBLEVEL = 22
-EXTRAVERSION =
+EXTRAVERSION = -openpower1
NAME = Blurry Fish Butt