Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp4700453pxf; Tue, 23 Mar 2021 18:25:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqPzxCAr2XrGXTXoZxNaL19+5XqQX/D9bHxyHetfht2d8wqtaOvzRp6bu3q54QLU7nYh4D X-Received: by 2002:a17:906:314f:: with SMTP id e15mr1020511eje.30.1616549152592; Tue, 23 Mar 2021 18:25:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616549152; cv=none; d=google.com; s=arc-20160816; b=LMEw2sCB7e49+TKIACCSRUJrOP2Y9AgDYxgAFucz8opTkvOCSqmrmToFFviov2ukHB OsV5gcn1doG0+PaoRc5Z+jpAON6V6Ld3ybz41V1XGW6gdFJ+GPnn4ZO1eNUQB6Qy77PP 7IaVBQA3MNuwkiIMALjmEzmejlmaCrrCYvykjDuxfJwBO38woFXdn8ZJZAcjApS/nR61 5brmzoZ6p/MrJ2ImMfy3S0qYt9fRjKm4M4YERTLus9TJT4H6WjYaj+4d+trADrJNk4NH KPB9uPCJgEnhCWKPbMvGE+/TNH/xwHkKMpdTXr4BSuqlzVxNc6il9RC1jPdCDQIsaLUm 72hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=j3mXP4S9KOlh1bl8aoXVRKw88IIOU9/7kJaQJkz/Hu8=; b=vUdlP4DgVfLhecN+JnohqjEtN0HpIGBZ384gQginwRAR9LsEYmr526YubNF0Le+W0u d+D3l+gQ1mzrq6c5rLSEg0mrzc66I0f7w/BtTtuYeX/coIK63lzSQg4i32Q+5CbWm4ly qNXGXC31Q2OTYHVZiZjDM1icKbJHMFgFh/OWDTNQawUtWBhHZtui3R4T/Ei8dscSpqsa BMQLSLezOF0IVuk7Z03JYf3WJc/XRWJCMLsREn5dSCxcoNETAWTzBF+6+gm4F8CG22nN 6Cv4q1ayu3EY6oZeB+q/vmFUYHpH3tE2tdinD+vjtwRJKHCIIx7NdNprPb9Ee4b9mV/X gRig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=le8IZ6Ol; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r17si524621eds.189.2021.03.23.18.25.29; Tue, 23 Mar 2021 18:25:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=le8IZ6Ol; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231665AbhCWN5P (ORCPT + 99 others); Tue, 23 Mar 2021 09:57:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:54272 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231741AbhCWN4q (ORCPT ); Tue, 23 Mar 2021 09:56:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 774A061994; Tue, 23 Mar 2021 13:56:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1616507806; bh=V3M2Dwm+0tFY5g4Ivpe5s7ILfl+D4bolXtaNcX5eTA0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=le8IZ6Ol3RW2ZmuZSIUdM8NL+6nfJVyv2ZMvELYIG49JOKkcwJ0PpPaj8wgOPsFaF 6OEfzLI4pNQzlLIKPM53437m8DB3Ke3B7PGcI+9FPo5amtLHnncbJDMlIq8OmWOg7M fsj+nvD3pHpGZRGzqJvqQAQtJAJwLH4jhcRFHfwI= Date: Tue, 23 Mar 2021 14:50:21 +0100 From: Greg Kroah-Hartman To: Nick Desaulniers Cc: Sasha Levin , clang-built-linux@googlegroups.com, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH] scripts: stable: add script to validate backports Message-ID: References: <20210316213136.1866983-1-ndesaulniers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210316213136.1866983-1-ndesaulniers@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 16, 2021 at 02:31:33PM -0700, Nick Desaulniers wrote: > A common recurring mistake made when backporting patches to stable is > forgetting to check for additional commits tagged with `Fixes:`. This > script validates that local commits have a `commit upstream.` > line in their commit message, and whether any additional `Fixes:` shas > exist in the `master` branch but were not included. It can not know > about fixes yet to be discovered, or fixes sent to the mailing list but > not yet in mainline. > > To save time, it avoids checking all of `master`, stopping early once > we've reached the commit time of the earliest backport. It takes 0.5s to > validate 2 patches to linux-5.4.y when master is v5.12-rc3 and 5s to > validate 27 patches to linux-4.19.y. It does not recheck dependencies of > found fixes; the user is expected to run this script to a fixed point. > It depnds on pygit2 python library for working with git, which can be > installed via: > $ pip3 install pygit2 > > It's expected to be run from a stable tree with commits applied. For > example, consider 3cce9d44321e which is a fix for f77ac2e378be. Let's > say I cherry picked f77ac2e378be into linux-5.4.y but forgot > 3cce9d44321e (true story). If I ran: > > $ ./scripts/stable/check_backports.py > Checking 1 local commits for additional Fixes: in master > Please consider backporting 3cce9d44321e as a fix for f77ac2e378be While interesting, I don't use a git tree for the stable queue, so this doesn't really fit into my workflow, sorry. And we do have other "stable tree helper" scripts in the stable-queue.git repo, perhaps that's a better place for this than the main kernel repo? thanks, greg k-h