From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:40838 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726293AbeJCBWQ (ORCPT ); Tue, 2 Oct 2018 21:22:16 -0400 Date: Tue, 2 Oct 2018 11:37:31 -0700 From: Greg KH To: Michael Bringmann Cc: mpe@ellerman.id.au, stable@vger.kernel.org Subject: Re: FAILED: patch "[PATCH] powerpc/pseries: Fix unitialized timer reset on migration" failed to apply to 4.4-stable tree Message-ID: <20181002183731.GA27582@kroah.com> References: <153848271313943@kroah.com> <10de1312-353a-2c0e-ab00-6a4e037a5fae@linux.vnet.ibm.com> <20181002162739.GE7523@kroah.com> <0b66e539-dad7-9506-cbc0-d86cd36ea68e@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0b66e539-dad7-9506-cbc0-d86cd36ea68e@linux.vnet.ibm.com> Sender: stable-owner@vger.kernel.org List-ID: On Tue, Oct 02, 2018 at 01:30:28PM -0500, Michael Bringmann wrote: > 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 > > Can you send these all in a format that I can actually apply them in? This way does not work, sorry. greg k-h