Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Jan 2021 07:59:13 -0600
From:      Kyle Evans <kevans@freebsd.org>
To:        Hans Petter Selasky <hselasky@freebsd.org>
Cc:        src-committers <src-committers@freebsd.org>, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org
Subject:   Re: git: e006b6a2c1b9 - stable/12 - MFC 376479200760: Fix whitespace in mlx5en(4).
Message-ID:  <CACNAnaHJ1vdtUnH=9rDHpT-zhX4UujExSdkin6NvkpyvAs1-aQ@mail.gmail.com>
In-Reply-To: <202101221230.10MCULuw000439@gitrepo.freebsd.org>
References:  <202101221230.10MCULuw000439@gitrepo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Jan 22, 2021 at 6:30 AM Hans Petter Selasky
<hselasky@freebsd.org> wrote:
>
> The branch stable/12 has been updated by hselasky:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=e006b6a2c1b9a34e008ffbb4cabf86315f7873ff
>
> commit e006b6a2c1b9a34e008ffbb4cabf86315f7873ff
> Author:     Hans Petter Selasky <hselasky@FreeBSD.org>
> AuthorDate: 2021-01-08 11:44:42 +0000
> Commit:     Hans Petter Selasky <hselasky@FreeBSD.org>
> CommitDate: 2021-01-22 12:08:03 +0000
>
>     MFC 376479200760:
>     Fix whitespace in mlx5en(4).
>
>     Sponsored by: Mellanox Technologies // NVIDIA Networking
> ---

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACNAnaHJ1vdtUnH=9rDHpT-zhX4UujExSdkin6NvkpyvAs1-aQ>