diff options
author | Joel Stanley <joel@jms.id.au> | 2018-05-21 13:18:59 +0930 |
---|---|---|
committer | Joel Stanley <joel@jms.id.au> | 2018-05-21 13:20:15 +0930 |
commit | 33656396384faa2320e64db987a863db94c180dc (patch) | |
tree | 2f4fedb209927bc25c9bb709abf6a774ab37a949 | |
parent | 1a64d43aaab6116a412ce14298df526e5b786742 (diff) | |
download | blackbird-op-build-33656396384faa2320e64db987a863db94c180dc.tar.gz blackbird-op-build-33656396384faa2320e64db987a863db94c180dc.zip |
kernel: Move to Linux v4.16.10-openpower1
Drop "scsi: aacraid: Correct hba_send to include iu_type" as it has been
merged into the stable tree.
Signed-off-by: Joel Stanley <joel@jms.id.au>
19 files changed, 22 insertions, 77 deletions
diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig index 5493a1af..9d0f6357 100644 --- a/openpower/configs/barreleye_defconfig +++ b/openpower/configs/barreleye_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.10" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig index b0e40527..b9a5f2ba 100644 --- a/openpower/configs/firenze_defconfig +++ b/openpower/configs/firenze_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.10" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig index a860aeea..7e5bbc65 100644 --- a/openpower/configs/firestone_defconfig +++ b/openpower/configs/firestone_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.10" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig index a9cbba6a..36faf51d 100644 --- a/openpower/configs/garrison_defconfig +++ b/openpower/configs/garrison_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.10" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig index c4c262d8..148a9dc2 100644 --- a/openpower/configs/habanero_defconfig +++ b/openpower/configs/habanero_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.10" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig index 0b9365da..60a544e0 100644 --- a/openpower/configs/openpower_mambo_defconfig +++ b/openpower/configs/openpower_mambo_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.10" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/openpower_p9_mambo_defconfig b/openpower/configs/openpower_p9_mambo_defconfig index 654e4717..56a07042 100644 --- a/openpower/configs/openpower_p9_mambo_defconfig +++ b/openpower/configs/openpower_p9_mambo_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.10" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig index 8bca9376..2ad6a1ec 100644 --- a/openpower/configs/p9dsu_defconfig +++ b/openpower/configs/p9dsu_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.10" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig index 5da4b51b..97a72d9d 100644 --- a/openpower/configs/palmetto_defconfig +++ b/openpower/configs/palmetto_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.10" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/pseries_defconfig b/openpower/configs/pseries_defconfig index b8a626b1..2fe5c299 100644 --- a/openpower/configs/pseries_defconfig +++ b/openpower/configs/pseries_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.10" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/pseries_skiroot_defconfig" diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig index 0f5f47be..e359e452 100644 --- a/openpower/configs/romulus_defconfig +++ b/openpower/configs/romulus_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.10" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/vesnin_defconfig b/openpower/configs/vesnin_defconfig index 5ebcd97d..927d321d 100644 --- a/openpower/configs/vesnin_defconfig +++ b/openpower/configs/vesnin_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.10" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig index c98a75dc..52ebe4af 100644 --- a/openpower/configs/witherspoon_defconfig +++ b/openpower/configs/witherspoon_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.10" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig index f2733eff..78d27853 100644 --- a/openpower/configs/zaius_defconfig +++ b/openpower/configs/zaius_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.10" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig index dbbf944c..bbbcd331 100644 --- a/openpower/configs/zz_defconfig +++ b/openpower/configs/zz_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.10" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" 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 bca0375e..c26cfa8c 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/4] xhci: Reset controller on xhci shutdown +Subject: [PATCH 1/3] 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. diff --git a/openpower/linux/0003-powerpc-perf-Fix-memory-allocation-for-core-imc-base.patch b/openpower/linux/0002-powerpc-perf-Fix-memory-allocation-for-core-imc-base.patch index 274ce846..76436dae 100644 --- a/openpower/linux/0003-powerpc-perf-Fix-memory-allocation-for-core-imc-base.patch +++ b/openpower/linux/0002-powerpc-perf-Fix-memory-allocation-for-core-imc-base.patch @@ -1,7 +1,7 @@ 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 3/4] powerpc/perf: Fix memory allocation for core-imc based on +Subject: [PATCH 2/3] 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 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 deleted file mode 100644 index 7d465614..00000000 --- a/openpower/linux/0002-scsi-aacraid-Correct-hba_send-to-include-iu_type.patch +++ /dev/null @@ -1,55 +0,0 @@ -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/0004-Release-OpenPower-kernel.patch b/openpower/linux/0003-Release-OpenPower-kernel.patch index 0229f65e..8db3a83b 100644 --- a/openpower/linux/0004-Release-OpenPower-kernel.patch +++ b/openpower/linux/0003-Release-OpenPower-kernel.patch @@ -1,7 +1,7 @@ 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 +Date: Mon, 21 May 2018 13:14:36 +0930 +Subject: [PATCH 3/3] Release OpenPower kernel Signed-off-by: Joel Stanley <joel@jms.id.au> --- @@ -9,15 +9,15 @@ Signed-off-by: Joel Stanley <joel@jms.id.au> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 5da6ffd69209..6d6fbae5e2b9 100644 +index 33f3c94f02ca..6640ae3514a1 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VERSION = 4 PATCHLEVEL = 16 - SUBLEVEL = 8 + SUBLEVEL = 10 -EXTRAVERSION = -+EXTRAVERSION = -openpower2 ++EXTRAVERSION = -openpower1 NAME = Fearless Coyote # *DOCUMENTATION* |