git: e006b6a2c1b9 - stable/12 - MFC 376479200760: Fix whitespace in mlx5en(4).

[Warner Losh]

On Fri, Jan 22, 2021 at 7:26 AM Kyle Evans <kevans at freebsd.org> wrote:

> On Fri, Jan 22, 2021 at 8:19 AM Hans Petter Selasky <hps at selasky.org>
> wrote:
> >
> > 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/
> >
>
> The committers guide wasn't going to be updated with the contents of
> Warner's freebsd-git-docs until the doc switch to a less arcane
> format.
>

It will be updated when the switch to asciidoc is done + a couple of days.
For the moment, my MFC doc takes precedence over the committers guide.

Warner