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=-7.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,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 7A53EC433E6 for ; Tue, 1 Sep 2020 17:06:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5A7F42078B for ; Tue, 1 Sep 2020 17:06:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="u82f5+1a" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729752AbgIARGo (ORCPT ); Tue, 1 Sep 2020 13:06:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729544AbgIARGh (ORCPT ); Tue, 1 Sep 2020 13:06:37 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16A5FC061244; Tue, 1 Sep 2020 10:06:36 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id m8so1157557pfh.3; Tue, 01 Sep 2020 10:06:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=PwNRndak15FLf6udHGPDXV3xJclmFk58fcQPrWISEyg=; b=u82f5+1anvYlYHJs/pJvG3+NLXqCVZH3FiTol6fLHW1d3wmBNBgerRa4yBh73/LOQr JJOrhtRUVUP2xuQVN5Ydp6AmboX0BMO4ziQXoNB7AickRbwiT1QTlIa9n+2cEWVRefjP Dkjj/Icu7TrDSd79eTW1qGRWm7ZPAQUi3M6Cwuib+RNoGzm64F7tFXAKuyDddMODzoc8 kwDn1jUuDQcF4+TicXIKRz6ayPVb+6XuC5JyXjKfAGiB65AlCo1Yy9qG0r8d6RtMuDAR bVtOu2k3HcIlVHGAL2LgWrTe/HXhHAbRQ4PLruDD/wVJU85WGEPbQ48qCxVr5+Dg3d9z TP0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=PwNRndak15FLf6udHGPDXV3xJclmFk58fcQPrWISEyg=; b=lcaEaFq6i5sO62wmt1gawR/L6aOOZMI/zo5x9mPg/yxPU+9VeAb1cI5Abc71YaUe0P NcpuvENtL/46jKZgtMCoZACVw7+lcvAJ7UdR1ilS/gjxZu+yqgdVpmWtfBlv/RdqNhp6 LG/x+Qim/2j4J21/yLI2yhNSIQGYcylWqnZcPSD9FHQjnR7C42Mn34t/o5l5fnuRgGTv Gwz6+j5PtMhP9+re5VhrRzcUI5mYbsT8+bteQ41OU0+lN7Yg/DFcK51nTgPvgiOfMFob +65D7ljHOiykelh0S+OPp+ZerJARWSUtEKX1550O13Qb99bR+JVj6EArjkogbjjmXV7t 6cLw== X-Gm-Message-State: AOAM531sTj6DEepIlooxQDH9DJSa5pb42BzDPHjiQxZWx/2/oHBNmbx/ DVam7ai2NWozzx7o27quuK8= X-Google-Smtp-Source: ABdhPJyy7JOa3sxonsjDIcIjoW7WMS7fwqpw3kiqxp+QzUYZE4hxNju76g8xRz1QZ/Dl2wBypUzyhg== X-Received: by 2002:a63:4418:: with SMTP id r24mr2281840pga.8.1598979995594; Tue, 01 Sep 2020 10:06:35 -0700 (PDT) Received: from [192.168.219.31] (ip72-219-184-175.oc.oc.cox.net. [72.219.184.175]) by smtp.gmail.com with ESMTPSA id 13sm2603359pfp.3.2020.09.01.10.06.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 01 Sep 2020 10:06:34 -0700 (PDT) Subject: Re: RFC: backport of commit a32c1c61212d To: Florian Fainelli , Greg Kroah-Hartman Cc: stable@vger.kernel.org, Andrew Morton , Mike Rapoport , Pavel Tatashin , Russell King , Michal Hocko , Olof Johansson , Zhaoyang Huang , zhaoyang , Ingo Molnar , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, David Hildenbrand , Baoquan He References: <20200901140018.GD397411@kroah.com> <4eb51ae0-427d-5359-2439-b38dc0d3b2e5@gmail.com> <98f2309c-e674-c3fc-0c13-0bf85f123f8c@gmail.com> From: Doug Berger Message-ID: <62fef535-199b-9b62-c206-c92d2d929be3@gmail.com> Date: Tue, 1 Sep 2020 10:09:37 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <98f2309c-e674-c3fc-0c13-0bf85f123f8c@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 9/1/2020 9:36 AM, Florian Fainelli wrote: > > > On 9/1/2020 9:06 AM, Doug Berger wrote: >> On 9/1/2020 7:00 AM, Greg Kroah-Hartman wrote: > > [snip] > >> [snip] >> >> My best guess at this point is to submit patches to the affected stable >> branches like the one in my RFC and reference a32c1c61212d as the >> upstream commit. This would be confusing to anyone that tried to compare >> the submitted patch with the upstream patch since they >> wouldn't look at all alike, but the fixes and upstream tags would define >> the affected range in Linus' tree. >> >> I would appreciate any guidance on how best to handle this kind of >> situation. > > You could submit various patches with [PATCH stable x.y] in the subject > to indicate they are targeting a specific stable branch, copy > stable@vger.kernel.org as well as all recipients in this email and see > if that works. > > Not sure if there is a more documented process than that. Yes, that is what I had in mind based on the "Option 3" for patch submission. The sticking point is this requirement: "You must note the upstream commit ID in the changelog of your submission" My best guess is to use a32c1c61212d, but that could easily cause confusion in this case. My hope is that now I can reference this discussion to provide additional clarity. Thanks, Doug