svn commit: r364806 - in head/sys/contrib/openzfs: include/os/freebsd/spl/sys module/os/freebsd/spl

[Warner Losh]

On Wed, Aug 26, 2020 at 11:33 AM John Baldwin <jhb at freebsd.org> wrote:

> On 8/26/20 10:15 AM, Matthew Macy wrote:
> > Do not commit directly to sys/contrib. PR, vendor branch update, then
> merge.
>
> We do live in a world where source control is able to merge changes, and
> it should be ok in that world to commit things directly while waiting for
> the PR to be merged and letting the VCS figure it out on the next merge.
> We haven't had a policy of never comitting directly to contrib/ since the
> CVS days.  I do agree that changes should be pushed upstream to keep local
> diffs as small as possible, but reasonable judgement should be applied
> rather than a hard rule banning all commits.
>

Matt's wording sucked. However, he's requesting that people push changes
upstream for the moment to help him manage because he's planning on doing
several more vendor imports in the coming days and these commits lead to
conflicts which slow him down. It's not a hard lock, but a very strong
request to make his life easier while the velocity upstream is still kinda
fast and we need to loop in many of those changes in.

Warner


> > On Wed, Aug 26, 2020 at 12:29 AM Toomas Soome <tsoome at freebsd.org>
> wrote:
> >>
> >> Author: tsoome
> >> Date: Wed Aug 26 07:29:17 2020
> >> New Revision: 364806
> >> URL: https://svnweb.freebsd.org/changeset/base/364806
> >>
> >> Log:
> >>   remove pragma ident lines
> >>
> >>   The #pragma ident is historical relict and not needed any more, this
> >>   pragma is actually unknown for common compilers and is only causing
> >>   trouble.
>
> --
> John Baldwin
>