From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail.kernel.org ([198.145.29.99]:48536 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1754014AbeDZRox (ORCPT <rfc822;stable@vger.kernel.org>);
        Thu, 26 Apr 2018 13:44:53 -0400
Date: Thu, 26 Apr 2018 19:44:44 +0200
From: Greg KH <gregkh@linuxfoundation.org>
To: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: schwidefsky@de.ibm.com, stable@vger.kernel.org,
        Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Subject: Re: FAILED: patch "[PATCH] s390: add support for IBM z14 Model ZR1"
 failed to apply to 4.14-stable tree
Message-ID: <20180426174444.GA28091@kroah.com>
References: <152438809063209@kroah.com>
 <20180426084901.GA3212@osiris>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20180426084901.GA3212@osiris>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Thu, Apr 26, 2018 at 10:49:01AM +0200, Heiko Carstens wrote:
> On Sun, Apr 22, 2018 at 11:08:10AM +0200, gregkh@linuxfoundation.org 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@vger.kernel.org>.
> > 
> > thanks,
> > 
> > greg k-h
> > 
> > ------------------ original commit in Linus's tree ------------------
> > 
> > From 451239eb3d397bd197a79cc3aab943da41ba0905 Mon Sep 17 00:00:00 2001
> > From: Heiko Carstens <heiko.carstens@de.ibm.com>
> > 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@vger.kernel.org> # v4.14+
> > Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
> > Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
> 
> 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