From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 256BCC74A48 for ; Thu, 11 Jul 2019 06:45:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF8B021537 for ; Thu, 11 Jul 2019 06:45:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562827558; bh=QO+IixaEINnRUlMplYokoVhew/W3TcWPGiXzmUqgm7o=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=dzFYlEwx3JjPzeJFrhjOGxIi35usNv9RNI6vid+3cW3ZtdQa6FQndE+V1ecmqqnof VvVE4A6tfbMKWiwvhEqkmwYtwpqgbkSw3fpePutDDVhR4yxctM+3cJ4JtscLXX4xm4 k7fZCSuSzGrIcDoerKiPGBqqPpW9HHirBt93vEcQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728090AbfGKGp4 (ORCPT ); Thu, 11 Jul 2019 02:45:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:54578 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725963AbfGKGp4 (ORCPT ); Thu, 11 Jul 2019 02:45:56 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2A15420838; Thu, 11 Jul 2019 06:45:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562827555; bh=QO+IixaEINnRUlMplYokoVhew/W3TcWPGiXzmUqgm7o=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=E4uwDe7hAN9V7ID7Uhs6z8LLObasbqynt8fY1jOyrIF2+mm5V1AucAT5rS8vAJvqM wIAqXgaIbvOCTAjumznze5OfEmXwOf8MaRD+PxoVYBSbL64P3L7OkWCL2SLTC0aVRw nudkd/v0vOH5s8bJH4EQrHWl+pE0He/XkxfFILgc= Date: Thu, 11 Jul 2019 08:45:52 +0200 From: Greg Kroah-Hartman To: Steven Rostedt Cc: Linus Torvalds , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Borislav Petkov , Ingo Molnar , "H. Peter Anvin" , Dave Hansen , Juergen Gross , LKML , He Zhe , Joel Fernandes , devel@etsukata.com, stable , Sasha Levin Subject: Re: [PATCH v2 5/7] x86/mm, tracing: Fix CR2 corruption Message-ID: <20190711064552.GB10089@kroah.com> References: <20190704195555.580363209@infradead.org> <20190704200050.534802824@infradead.org> <20190710162709.1c306f8a@gandalf.local.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190710162709.1c306f8a@gandalf.local.home> User-Agent: Mutt/1.12.1 (2019-06-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jul 10, 2019 at 04:27:09PM -0400, Steven Rostedt wrote: > > [ added stable folks ] > > On Sun, 7 Jul 2019 11:17:09 -0700 > Linus Torvalds wrote: > > > On Sun, Jul 7, 2019 at 8:11 AM Andy Lutomirski wrote: > > > > > > FWIW, I'm leaning toward suggesting that we apply the trivial tracing > > > fix and backport *that*. Then, in -tip, we could revert it and apply > > > this patch instead. > > > > You don't have to have the same fix in stable as in -tip. > > > > It's fine to send something to stable that says "Fixed differently by > > commit XYZ upstream". The main thing is to make sure that stable > > doesn't have fixes that then get lost upstream (which we used to have > > long long ago). > > > > But isn't it easier for them to just pull the quick fix in, if it is in > your tree? That is, it shouldn't be too hard to make the "quick fix" > that gets backported on your tree (and probably better testing), and > then add the proper fix on top of it. The stable folks will then just > use the commit sha to know what to take, and feel more confident about > taking it. It all depends on what the "quick fix" is. The reason I want to take the exact same patch that is in Linus's tree is that 95% of the time that we do a "one off" patch for stable only, it's wrong. We _ALWAYS_ get it wrong somehow, it's crazy how bad we are at this. I don't know why this is, but we have the stats to prove it. Because of this, I now require the "one off" stable only fixes to get a bunch of people reviewing it and write up a bunch of explaination as to why this is the way it is and why we can't just take whatever is in mainline. thanks, greg k-h