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.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 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 2C2A2C74A35 for ; Wed, 10 Jul 2019 20:27:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 039A0208E4 for ; Wed, 10 Jul 2019 20:27:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727681AbfGJU1O (ORCPT ); Wed, 10 Jul 2019 16:27:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:34132 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727197AbfGJU1N (ORCPT ); Wed, 10 Jul 2019 16:27:13 -0400 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (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 3815E208C4; Wed, 10 Jul 2019 20:27:11 +0000 (UTC) Date: Wed, 10 Jul 2019 16:27:09 -0400 From: Steven Rostedt To: Linus Torvalds Cc: 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 , Greg Kroah-Hartman , Sasha Levin Subject: Re: [PATCH v2 5/7] x86/mm, tracing: Fix CR2 corruption Message-ID: <20190710162709.1c306f8a@gandalf.local.home> In-Reply-To: References: <20190704195555.580363209@infradead.org> <20190704200050.534802824@infradead.org> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ 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. -- Steve