On Sun, Apr 22, 2018 at 11:08:10AM +0200, gregkh@xxxxxxxxxxxxxxxxxxx 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 <stable@xxxxxxxxxxxxxxx>.
>
> thanks,
>
> greg k-h
>
> ------------------ original commit in Linus's tree ------------------
>
> From 451239eb3d397bd197a79cc3aab943da41ba0905 Mon Sep 17 00:00:00 2001
> From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
> 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: <stable@xxxxxxxxxxxxxxx> # v4.14+
> Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
> Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
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?