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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 77F67C43217 for ; Tue, 22 Nov 2022 14:59:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 60BFC10E0CC; Tue, 22 Nov 2022 14:59:16 +0000 (UTC) Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4374810E404 for ; Tue, 22 Nov 2022 14:59:14 +0000 (UTC) Received: by mail-wm1-x32d.google.com with SMTP id ay14-20020a05600c1e0e00b003cf6ab34b61so15424580wmb.2 for ; Tue, 22 Nov 2022 06:59:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=LhmDVFPi+nRjH1SiUZ4CgNLHOOBTy/Y9YuPSElfH8aY=; b=UyxCYENrxcNJB0XEEcZY7l+2jxVUuOcFAD+5ORxNbtdsRtFofYdI4lvwj2uCU0OhH4 RLkpRy3agAayRmHLYv4pFq36wxsV+U1l9VjlA0Iusfr0pRi7NLxBya3Nc7jl1BPHxVYI vxetXquMBAOI6pSHadNEEuisGsd9r0FHUVT1E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=LhmDVFPi+nRjH1SiUZ4CgNLHOOBTy/Y9YuPSElfH8aY=; b=hLcOLWb+vams/gQakBDovCAe0X/dzQ1wP5XC4pOK4aZB9pJlsscGiBPZ97Mc5znden t1NTU/ZR5HNaDtfnivJpayDQ2KqXasQ4vNcF4SufbDc52ORPM3JyiwmSjPIvWS+1Oia6 WNtQZElUGEygT0+jztaqJif7c2WXzbSMgEriqek5tAAZkxtqDpjC/HA8lzUCSMWs3Win FcCuLX2fIBO4VukcUW0CFkqGP91fKK0gmFHJ/P+BWnqkFyfoL4gy+9Lz1ShnvrHGTyO7 zbgAGY84rEUQzPxq8RaknwaUavQR905yr4Jm1jfJidKHYPxI84rfwfqrvX46fO94Br4v GFYA== X-Gm-Message-State: ANoB5pkrSojF5JcSXdiT10TsaVY5M9QRq0j6lPnC7Wrw5Y2HNuPqhi2L 1cJgaiN37T86xNmKX/jGS/e9Fw== X-Google-Smtp-Source: AA0mqf4RzFqtTLS34nij10Kc2ZFArD6T7Pxx8/0WrX6CSOKGs/Yg0XMN8lfPUIxAT6rIPpi1cbiVyA== X-Received: by 2002:a05:600c:468e:b0:3cf:7b67:f692 with SMTP id p14-20020a05600c468e00b003cf7b67f692mr9843465wmo.139.1669129152504; Tue, 22 Nov 2022 06:59:12 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-33.fiber7.init7.net. [212.51.149.33]) by smtp.gmail.com with ESMTPSA id v1-20020a5d6101000000b002365cd93d05sm13962692wrt.102.2022.11.22.06.59.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 06:59:12 -0800 (PST) Date: Tue, 22 Nov 2022 15:59:10 +0100 From: Daniel Vetter To: Jani Nikula Message-ID: References: <20221122131714.3443238-1-jani.nikula@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221122131714.3443238-1-jani.nikula@intel.com> X-Operating-System: Linux phenom 5.19.0-2-amd64 Subject: Re: [Intel-gfx] [MAINTAINER TOOLS] docs: updated rules for topic/core-for-CI commit management X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dim-tools@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Rodrigo Vivi , David Airlie Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Nov 22, 2022 at 03:17:14PM +0200, Jani Nikula wrote: > Introduce stricter rules for topic/core-for-CI management. Way too many > commits have been added over the years, with insufficient rationale > recorded in the commit message, and insufficient follow-up with removing > the commits from the topic branch. > > New rules: > > 1. Require maintainer ack for rebase. Have better gating on when rebases > happen and on which baselines. > > 2. Require maintainer/committer ack for adding/removing commits. No > single individual should decide. > > 3. Require gitlab issues for new commits added. Improve tracking for > removing the commits. > > Also use the stronger "must" for commit message requiring the > justification for the commit being in topic/core-for-CI. > > Cc: Joonas Lahtinen > Cc: Rodrigo Vivi > Cc: Tvrtko Ursulin > Cc: David Airlie > Cc: Daniel Vetter > Cc: intel-gfx@lists.freedesktop.org > Cc: dri-devel@lists.freedesktop.org > Cc: dim-tools@lists.freedesktop.org > Signed-off-by: Jani Nikula Reviewed-by: Daniel Vetter > --- > drm-tip.rst | 27 ++++++++++++++++++++------- > 1 file changed, 20 insertions(+), 7 deletions(-) > > diff --git a/drm-tip.rst b/drm-tip.rst > index deae95cdd2fe..24036e2ef576 100644 > --- a/drm-tip.rst > +++ b/drm-tip.rst > @@ -203,11 +203,13 @@ justified exception. The primary goal is to fix issues originating from Linus' > tree. Issues that would need drm-next or other DRM subsystem tree as baseline > should be fixed in the offending DRM subsystem tree. > > -Only rebase the branch if you really know what you're doing. When in doubt, ask > -the maintainers. You'll need to be able to handle any conflicts in non-drm code > -while rebasing. > +Only rebase the branch if you really know what you're doing. You'll need to be > +able to handle any conflicts in non-drm code while rebasing. > > -Simply drop fixes that are already available in the new baseline. > +Always ask for maintainer ack before rebasing. IRC ack is sufficient. > + > +Simply drop fixes that are already available in the new baseline. Close the > +associated gitlab issue when removing commits. > > Force pushing a rebased topic/core-for-CI requires passing the ``--force`` > parameter to git:: > @@ -225,11 +227,22 @@ judgement call. > Only add or remove commits if you really know what you're doing. When in doubt, > ask the maintainers. > > -Apply new commits on top with regular push. The commit message needs to explain > -why the patch has been applied to topic/core-for-CI. If it's a cherry-pick from > +Always ask for maintainer/committer ack before adding/removing commits. IRC ack > +is sufficient. Record the ``Acked-by:`` in commits being added. > + > +Apply new commits on top with regular push. The commit message must explain why > +the patch has been applied to topic/core-for-CI. If it's a cherry-pick from > another subsystem, please reference the commit with ``git cherry-pick -x`` > option. If it's a patch from another subsystem, please reference the patch on > the mailing list with ``Link:`` tag. > > +New commits always need an associated gitlab issue for tracking purposes. The > +goal is to have as few commits in topic/core-for-CI as possible, and we need to > +be able to track the progress in making that happen. Reference the issue with > +``References:`` tag. Add the ``core-for-CI`` label to the issue. (Note: Do not > +use ``Closes:`` because the logic here is backwards; the issue is having the > +commit in the branch in the first place.) > + > Instead of applying reverts, just remove the commit. This implies ``git rebase > --i`` on the current baseline; see directions above. > +-i`` on the current baseline; see directions above. Close the associated gitlab > +issue when removing commits. > -- > 2.34.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch