From owner-dev-commits-src-branches@freebsd.org  Fri Jan 22 14:19:20 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@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 D8ECD4F6502;
 Fri, 22 Jan 2021 14:19:20 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from mail.turbocat.net (turbocat.net [88.99.82.50])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DMhGJ56H1z3FRC;
 Fri, 22 Jan 2021 14:19:20 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from hps2020.home.selasky.org (unknown [178.17.145.105])
 (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)
 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
 (No client certificate requested)
 by mail.turbocat.net (Postfix) with ESMTPSA id 4D29E260206;
 Fri, 22 Jan 2021 15:19:13 +0100 (CET)
Subject: Re: git: e006b6a2c1b9 - stable/12 - MFC 376479200760: Fix whitespace
 in mlx5en(4).
To: Kyle Evans <kevans@freebsd.org>
Cc: src-committers <src-committers@freebsd.org>,
 dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org,
 Warner Losh <imp@bsdimp.com>
References: <202101221230.10MCULuw000439@gitrepo.freebsd.org>
 <CACNAnaHJ1vdtUnH=9rDHpT-zhX4UujExSdkin6NvkpyvAs1-aQ@mail.gmail.com>
From: Hans Petter Selasky <hps@selasky.org>
Message-ID: <30b9e294-6767-abd4-e3a3-7a2d268323f9@selasky.org>
Date: Fri, 22 Jan 2021 15:19:01 +0100
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101
 Thunderbird/78.5.0
MIME-Version: 1.0
In-Reply-To: <CACNAnaHJ1vdtUnH=9rDHpT-zhX4UujExSdkin6NvkpyvAs1-aQ@mail.gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-Rspamd-Queue-Id: 4DMhGJ56H1z3FRC
X-Spamd-Bar: ----
Authentication-Results: mx1.freebsd.org;
	none
X-Spamd-Result: default: False [-4.00 / 15.00];
	 REPLY(-4.00)[]
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
 <dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>, 
 <mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>, 
 <mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jan 2021 14:19:20 -0000

On 1/22/21 2:59 PM, Kyle Evans wrote:
> For the record, as per [0], these should have been cherry-picked using
> -x which adds a " (cherry picked from commit ...)" annotation at the
> bottom. With the annotation in place, the leading MFC line can be
> dropped and the original message otherwise preserved (dropping any
> metadata at the bottom that makes sense, e.g. "MFC after" tags). The
> -x line helps at least the MFC tracker match the commit from main.
> 
> Thanks,
> 
> Kyle Evans
> 
> [0]https://github.com/bsdimp/freebsd-git-docs/blob/main/MFC.md

Hi Kyle,

Shouldn't the committers-guide be updated to reflect this is now the 
official way to do it?

https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/

I see no problem keeping MFC at the beginning of commit e-mails. Makes 
it easier to sort, and it is backwards compatible!

MFC rXXXXX refers to a SVN commit.
MFC [0-9 A-F] indicate a GIT commit.

BTW: When MFC-ing a commit which was done using SVN, should we use MFC r 
  or refer to the git hash?

--HPS