From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:36764 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754705AbeDZItJ (ORCPT ); Thu, 26 Apr 2018 04:49:09 -0400 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w3Q8iCAh194694 for ; Thu, 26 Apr 2018 04:49:08 -0400 Received: from e06smtp12.uk.ibm.com (e06smtp12.uk.ibm.com [195.75.94.108]) by mx0b-001b2d01.pphosted.com with ESMTP id 2hk8d1gdnx-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 26 Apr 2018 04:49:07 -0400 Received: from localhost by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 26 Apr 2018 09:49:06 +0100 Date: Thu, 26 Apr 2018 10:49:01 +0200 From: Heiko Carstens To: gregkh@linuxfoundation.org Cc: schwidefsky@de.ibm.com, stable@vger.kernel.org, Hendrik Brueckner Subject: Re: FAILED: patch "[PATCH] s390: add support for IBM z14 Model ZR1" failed to apply to 4.14-stable tree References: <152438809063209@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <152438809063209@kroah.com> Message-Id: <20180426084901.GA3212@osiris> Sender: stable-owner@vger.kernel.org List-ID: 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 . > > thanks, > > greg k-h > > ------------------ original commit in Linus's tree ------------------ > > From 451239eb3d397bd197a79cc3aab943da41ba0905 Mon Sep 17 00:00:00 2001 > From: Heiko Carstens > 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: # v4.14+ > Signed-off-by: Heiko Carstens > Signed-off-by: Martin Schwidefsky 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?