FAILED: patch "[PATCH] s390: add support for IBM z14 Model ZR1" failed to apply to 4.14-stable tree

PATCH [email protected] 3 participants 4 messages Apr 22, 2018 – Apr 26, 2018

Subsystems (2)

Stable branch s390

lore

Share & tools

lore

[email protected]

author maintainer

2018-04-22 09:08 UTC #0 lore raw

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 451239eb3d397bd197a79cc3aab943da41ba0905 Mon Sep 17 00:00:00 2001

From: Heiko Carstens <[email protected]>
Date: Fri, 13 Apr 2018 14:04:24 +0200
Subject: [PATCH] s390: add support for IBM z14 Model ZR1

Just add the new machine type number to the two places that matter.

Cc <[email protected]> # v4.14+

Signed-off-by Heiko Carstens <[email protected]>

Signed-off-by Martin Schwidefsky <[email protected]>

arch/s390/Kconfig +4 -4

index beccb58a82e5..199ac3e4da1d 100644
@@ -286,12 +286,12 @@ config MARCH_Z13
 	  older machines.
 
 config MARCH_Z14
-	bool "IBM z14"
+	bool "IBM z14 ZR1 and z14"
 	select HAVE_MARCH_Z14_FEATURES
 	help
-	  Select this to enable optimizations for IBM z14 (3906 series).
-	  The kernel will be slightly faster but will not work on older
-	  machines.
+	  Select this to enable optimizations for IBM z14 ZR1 and z14 (3907
+	  and 3906 series). The kernel will be slightly faster but will not
+	  work on older machines.
 
 endchoice

arch/s390/kernel/perf_cpum_cf_events.c +1 -0

index c5bc3f209652..5ee27dc9a10c 100644
@@ -583,6 +583,7 @@ __init const struct attribute_group **cpumf_cf_event_group(void)
 		model = cpumcf_z13_pmu_event_attr;
 		break;
 	case 0x3906:
+	case 0x3907:
 		model = cpumcf_z14_pmu_event_attr;
 		break;
 	default:

arch/s390/kernel/setup.c +1 -0

index fc3b4aa185cc..d82a9ec64ea9 100644
@@ -821,6 +821,7 @@ static int __init setup_hwcaps(void)
 		strcpy(elf_platform, "z13");
 		break;
 	case 0x3906:
+	case 0x3907:
 		strcpy(elf_platform, "z14");
 		break;
 	}

Heiko Carstens

2018-04-26 08:49 UTC #1 lore raw

Quoted 17 lines · On Sun, Apr 22, 2018 at 11:08:10AM +0200, [email protected] wrote:

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 451239eb3d397bd197a79cc3aab943da41ba0905 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <[email protected]>
Date: Fri, 13 Apr 2018 14:04:24 +0200
Subject: [PATCH] s390: add support for IBM z14 Model ZR1

Quoted 5 lines

Just add the new machine type number to the two places that matter.
Cc <[email protected]> # v4.14+
Signed-off-by Heiko Carstens <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>

This patch actually requires 3593eb944c65c7a0adfd679949e67f96d97d1768 ("s390/cpum_cf: add hardware counter support for IBM z14") to apply to the 4.14 branch.

The above mentionend cpum_cf patch does apply cleanly on v4.14, however I'm not sure if its ok to add such a large patch as pre-requisite for -stable?

Harsh Shandilya

2018-04-26 09:33 UTC #2 lore raw

Quoted 32 lines · Heiko Carstens

Quoted 4 lines · On Sun, Apr 22, 2018 at 11:08:10AM +0200, [email protected] wrote:
The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git
commit
Quoted 9 lines
id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 451239eb3d397bd197a79cc3aab943da41ba0905 Mon Sep 17 00:00:00
2001
Quoted 9 lines
From: Heiko Carstens <[email protected]>
Date: Fri, 13 Apr 2018 14:04:24 +0200
Subject: [PATCH] s390: add support for IBM z14 Model ZR1
Just add the new machine type number to the two places that matter.
Cc <[email protected]> # v4.14+
Signed-off-by Heiko Carstens <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
This patch actually requires 3593eb944c65c7a0adfd679949e67f96d97d1768 ("s390/cpum_cf: add hardware counter support for IBM z14") to apply to the
4.14 branch.

Quoted 4 lines

The above mentionend cpum_cf patch does apply cleanly on v4.14, however I'm
not sure if its ok to add such a large patch as pre-requisite for -stable?

Stable rules say patches should be 100 lines or lesser, which is rarely bent and this one's not even the actual patch that's the -stable candidate. Pretty sure Greg's going to answer with a nope. I've had to skip multiple ext4 patches when backporting for 3.18.y due to similar reasons.

Signature · 1 line

Harsh Shandilya, PRJKT Development LLC

Greg KH

author maintainer

2018-04-26 17:44 UTC #3 lore raw

In reply to Heiko Carstens

Quoted 24 lines · Heiko Carstens

Quoted 17 lines · On Sun, Apr 22, 2018 at 11:08:10AM +0200, [email protected] wrote:
The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 451239eb3d397bd197a79cc3aab943da41ba0905 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <[email protected]>
Date: Fri, 13 Apr 2018 14:04:24 +0200
Subject: [PATCH] s390: add support for IBM z14 Model ZR1
Quoted 5 lines
Just add the new machine type number to the two places that matter.
Cc <[email protected]> # v4.14+
Signed-off-by Heiko Carstens <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>

Quoted 6 lines

This patch actually requires 3593eb944c65c7a0adfd679949e67f96d97d1768 ("s390/cpum_cf: add hardware counter support for IBM z14") to apply to the 4.14 branch.
The above mentionend cpum_cf patch does apply cleanly on v4.14, however I'm not sure if its ok to add such a large patch as pre-requisite for -stable?

Yeah, it's not really a "quirk" being added here, sorry. So let's just leave this for now.

thanks,

greg k-h