From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:35070 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726174AbeJCBPP (ORCPT ); Tue, 2 Oct 2018 21:15:15 -0400 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w92ITAKG008202 for ; Tue, 2 Oct 2018 14:30:32 -0400 Received: from e13.ny.us.ibm.com (e13.ny.us.ibm.com [129.33.205.203]) by mx0a-001b2d01.pphosted.com with ESMTP id 2mvbfyeadg-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 02 Oct 2018 14:30:32 -0400 Received: from localhost by e13.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 2 Oct 2018 14:30:31 -0400 Subject: Re: FAILED: patch "[PATCH] powerpc/pseries: Fix unitialized timer reset on migration" failed to apply to 4.4-stable tree To: Greg KH Cc: mpe@ellerman.id.au, stable@vger.kernel.org References: <153848271313943@kroah.com> <10de1312-353a-2c0e-ab00-6a4e037a5fae@linux.vnet.ibm.com> <20181002162739.GE7523@kroah.com> From: Michael Bringmann Date: Tue, 2 Oct 2018 13:30:28 -0500 MIME-Version: 1.0 In-Reply-To: <20181002162739.GE7523@kroah.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Message-Id: <0b66e539-dad7-9506-cbc0-d86cd36ea68e@linux.vnet.ibm.com> Sender: stable-owner@vger.kernel.org List-ID: For 4.9-stable & 4.14-stable, we would adapt commit 8604895a34d92f5e186ceb931b0d1b384030ea3d to the following: diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c --- a/arch/powerpc/mm/numa.c 2018-10-02 13:18:42.615084257 -0500 +++ b/arch/powerpc/mm/numa.c 2018-10-02 13:19:51.488209551 -0500 @@ -1469,7 +1469,8 @@ { topology_timer.data = 0; topology_timer.expires = jiffies + 60 * HZ; - mod_timer(&topology_timer, topology_timer.expires); + if (vphn_enabled) + mod_timer(&topology_timer, topology_timer.expires); } #ifdef CONFIG_SMP On 10/02/2018 11:27 AM, Greg KH wrote: > On Tue, Oct 02, 2018 at 09:18:26AM -0500, Michael Bringmann wrote: >> To backport the patc >> >> commit 8604895a34d92f5e186ceb931b0d1b384030ea3d >> >> to the 4.4-stable tree, please try the following backport: > > What about 4.14-stable and 4.9-stable? > > thanks, > > greg k-h > > -- Michael W. Bringmann Linux Technology Center IBM Corporation Tie-Line 363-5196 External: (512) 286-5196 Cell: (512) 466-0650 mwb@linux.vnet.ibm.com