Date: Fri, 22 Jan 2021 14:08:32 -0700 From: Warner Losh <imp@bsdimp.com> To: Kyle Evans <kevans@freebsd.org> Cc: Hans Petter Selasky <hps@selasky.org>, 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: <CANCZdfoweec-fnuuv7bDd6EMeEJ5=NS6Gh=a=cfWxHNirdbwGw@mail.gmail.com> In-Reply-To: <CACNAnaEkqU5xr9jr-5hY0nZgZd6%2BQB3-zud6ejzKEhvH82AWqg@mail.gmail.com> References: <202101221230.10MCULuw000439@gitrepo.freebsd.org> <CACNAnaHJ1vdtUnH=9rDHpT-zhX4UujExSdkin6NvkpyvAs1-aQ@mail.gmail.com> <30b9e294-6767-abd4-e3a3-7a2d268323f9@selasky.org> <CACNAnaEkqU5xr9jr-5hY0nZgZd6%2BQB3-zud6ejzKEhvH82AWqg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Jan 22, 2021 at 7:26 AM Kyle Evans <kevans@freebsd.org> wrote: > On Fri, Jan 22, 2021 at 8:19 AM Hans Petter Selasky <hps@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfoweec-fnuuv7bDd6EMeEJ5=NS6Gh=a=cfWxHNirdbwGw>