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

2020-08-26 Thread Warner Losh
On Wed, Aug 26, 2020 at 11:33 AM John Baldwin 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

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

2020-08-26 Thread John Baldwin
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

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

2020-08-26 Thread Cy Schubert
If these are local FreeBSD changes then one *should* commit directly to contrib/. vendor is for virgin vendor sources, i.e. without our modifications. svn does a fair job of merging from vendor to contrib (though occasionally it gets it wrong). Ideally we should push our changes back to the

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

2020-08-26 Thread Matthew Macy
Do not commit directly to sys/contrib. PR, vendor branch update, then merge. On Wed, Aug 26, 2020 at 12:29 AM Toomas Soome 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

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

2020-08-26 Thread Toomas Soome
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