From owner-dev-commits-doc-all@freebsd.org Tue Apr 20 14:46:05 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B3F085D9AAF for ; Tue, 20 Apr 2021 14:46:05 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPmhX3SCjz4pgT; Tue, 20 Apr 2021 14:46:04 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: by mail-ej1-f42.google.com with SMTP id u21so58702375ejo.13; Tue, 20 Apr 2021 07:46:04 -0700 (PDT) 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-transfer-encoding :content-language; bh=qWoqy/0FAcV24fKxqQNNlGMHjBzk4tcQ2OM9SVKLOhM=; b=E00zN2K48KJSKaqazT4srCEZwzGzxFnlG8lD7JCDg78FVBtwuQKmWL37HTVy8TVcuL YCuoyJJUpHTaL2YicGR9s4YZ4uyfd0L2Do+kj0VE/kx10lo8mpkgzd6h6Lqn01TVv0QP 5FmFg8AnDBOg8uVFhrsNd1MtWOoUPbbEE4vuH7YRLAuMDB5XfIFDJsIGHHbi1rnbW7Xv YrI3Us5Ipgtec4b3cLkx67Fa2Vx7CSIwl1AaIaIlo6r/nHOtONEBDQrPGKMxu2AfQmDv oda4T/ljfmhLhhEtqFUosMqou0yH1zPwLFLXy9jBZ/a/6vaS1t66KMUQqIppwvIxAbG/ V9zQ== X-Gm-Message-State: AOAM533lKa6IXU5vTqtFeC98CjLqSzIuKRx/QoNFH0j9oFgUfS83CwYl LkazJ0lRQ1jtA++vPseZy68dKY6shaJcg2hj X-Google-Smtp-Source: ABdhPJwWUaXDyyUa1xqge0ctl+9ckOj7wSB/dEgRyvoyupzX9H5c7SLpFg/M6poKQsF2uvcZLIAOQA== X-Received: by 2002:a17:906:6a49:: with SMTP id n9mr28005809ejs.397.1618929963024; Tue, 20 Apr 2021 07:46:03 -0700 (PDT) Received: from [192.168.0.106] (ip5f5bd493.dynamic.kabel-deutschland.de. [95.91.212.147]) by smtp.gmail.com with ESMTPSA id x7sm15927382eds.67.2021.04.20.07.46.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 20 Apr 2021 07:46:02 -0700 (PDT) Subject: Re: git: ceee1def00 - main - articles/committers-guide: Document change in MFH policy To: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Cc: Mathieu Arnold , doc-committers@freebsd.org, dev-commits-doc-all@freebsd.org References: <202104201032.13KAWNFn016258@gitrepo.freebsd.org> <20210420122849.rh5v2kohzvkxs4uu@aching.in.mat.cc> <3252cd06-4140-0bc2-e958-983b4a2453c2@FreeBSD.org> From: Mateusz Piotrowski <0mp@FreeBSD.org> Message-ID: Date: Tue, 20 Apr 2021 16:46:13 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Rspamd-Queue-Id: 4FPmhX3SCjz4pgT X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of mpp302@gmail.com designates 209.85.218.42 as permitted sender) smtp.mailfrom=mpp302@gmail.com X-Spamd-Result: default: False [-2.88 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[209.85.218.42:from]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-0.88)[-0.880]; FREEMAIL_TO(0.00)[gmail.com]; FORGED_SENDER(0.30)[0mp@FreeBSD.org,mpp302@gmail.com]; RECEIVED_SPAMHAUS_PBL(0.00)[95.91.212.147:received]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_DKIM_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[0mp@FreeBSD.org,mpp302@gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-1.000]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; SPAMHAUS_ZRD(0.00)[209.85.218.42:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.218.42:from]; RCVD_IN_DNSWL_NONE(0.00)[209.85.218.42:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[dev-commits-doc-all] X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 14:46:05 -0000 On 20/04/2021 15:12, Fernando Apesteguía wrote: > On Tue, Apr 20, 2021 at 2:39 PM Mateusz Piotrowski <0mp@freebsd.org> wrote: >> On 20/04/2021 14:28, Mathieu Arnold wrote: >>> On Tue, Apr 20, 2021 at 10:32:23AM +0000, Mateusz Piotrowski wrote: >>>> The branch main has been updated by 0mp: >>>> >>>> URL: https://cgit.FreeBSD.org/doc/commit/?id=ceee1def00ac69f06b9d86b2fb1ff04bb6c84d48 >>>> >>>> commit ceee1def00ac69f06b9d86b2fb1ff04bb6c84d48 >>>> Author: Mateusz Piotrowski <0mp@FreeBSD.org> >>>> AuthorDate: 2021-04-20 10:14:58 +0000 >>>> Commit: Mateusz Piotrowski <0mp@FreeBSD.org> >>>> CommitDate: 2021-04-20 10:14:58 +0000 >>>> >>>> articles/committers-guide: Document change in MFH policy >>>> >>>> Merging commits into the quarterly branch no longer requires an explicit >>>> approval [1]. Let's remove outdated documentation and leave a note >>>> explaining that there is no need for an explicit approval to MFH. >>> Note that the MFH line should still be used to note intent. >> Hmm, true. It does make sense to leave MFH in the table of metadata fields for this use case. I'll >> bring back the MFH entry with an updated definition. > The template still says: > > # MFH: > > Maybe something like "State your intention to merge this change" would > be more appropriate. Good point! Here are some reviews for the hooks if you are interested: https://reviews.freebsd.org/D29861 https://reviews.freebsd.org/D29860 https://reviews.freebsd.org/D29858