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

[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 vendor, import those into 
vendor, then merge the official vendor sources/updates only after we 
receive them from the vendor or after the vendor has officially accepted 
them. But to put our changes into the vendor branch is wrong.


-- 
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  https://FreeBSD.org
NTP:           <cy at nwtime.org>    Web:  https://nwtime.org

	The need of the many outweighs the greed of the few.


In message <CAPrugNoaOLF0V5h8N_A_2BZ9sGAuhAkVi8-9of3RqqiSQMmdmg at mail.gmail.c
om>
, Matthew Macy writes:
> Do not commit directly to sys/contrib. PR, vendor branch update, then merge.
>
> 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.
> >
> > Modified:
> >   head/sys/contrib/openzfs/include/os/freebsd/spl/sys/acl_impl.h
> >   head/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h
> >   head/sys/contrib/openzfs/include/os/freebsd/spl/sys/extdirent.h
> >   head/sys/contrib/openzfs/include/os/freebsd/spl/sys/list.h
> >   head/sys/contrib/openzfs/include/os/freebsd/spl/sys/list_impl.h
> >   head/sys/contrib/openzfs/include/os/freebsd/spl/sys/zmod.h
> >   head/sys/contrib/openzfs/module/os/freebsd/spl/list.c
> >
> > Modified: head/sys/contrib/openzfs/include/os/freebsd/spl/sys/acl_impl.h
> > ===========================================================================
> ===
> > --- head/sys/contrib/openzfs/include/os/freebsd/spl/sys/acl_impl.h      Wed
>  Aug 26 07:00:07 2020        (r364805)
> > +++ head/sys/contrib/openzfs/include/os/freebsd/spl/sys/acl_impl.h      Wed
>  Aug 26 07:29:17 2020        (r364806)
> > @@ -26,8 +26,6 @@
> >  #ifndef _SYS_ACL_IMPL_H
> >  #define        _SYS_ACL_IMPL_H
> >
> > -#pragma ident  "%Z%%M% %I%     %E% SMI"
> > -
> >  #ifdef __cplusplus
> >  extern "C" {
> >  #endif
> >
> > Modified: head/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h
> > ===========================================================================
> ===
> > --- head/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h       Wed
>  Aug 26 07:00:07 2020        (r364805)
> > +++ head/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h       Wed
>  Aug 26 07:29:17 2020        (r364806)
> > @@ -31,8 +31,6 @@
> >  #ifndef _SYS_CMN_ERR_H
> >  #define        _SYS_CMN_ERR_H
> >
> > -#pragma ident  "%Z%%M% %I%     %E% SMI"
> > -
> >  #if !defined(_ASM)
> >  #include <sys/_stdarg.h>
> >  #endif
> >
> > Modified: head/sys/contrib/openzfs/include/os/freebsd/spl/sys/extdirent.h
> > ===========================================================================
> ===
> > --- head/sys/contrib/openzfs/include/os/freebsd/spl/sys/extdirent.h     Wed
>  Aug 26 07:00:07 2020        (r364805)
> > +++ head/sys/contrib/openzfs/include/os/freebsd/spl/sys/extdirent.h     Wed
>  Aug 26 07:29:17 2020        (r364806)
> > @@ -26,8 +26,6 @@
> >  #ifndef _SYS_EXTDIRENT_H
> >  #define        _SYS_EXTDIRENT_H
> >
> > -#pragma ident  "%Z%%M% %I%     %E% SMI"
> > -
> >  #ifdef __cplusplus
> >  extern "C" {
> >  #endif
> >
> > Modified: head/sys/contrib/openzfs/include/os/freebsd/spl/sys/list.h
> > ===========================================================================
> ===
> > --- head/sys/contrib/openzfs/include/os/freebsd/spl/sys/list.h  Wed Aug 26 
> 07:00:07 2020        (r364805)
> > +++ head/sys/contrib/openzfs/include/os/freebsd/spl/sys/list.h  Wed Aug 26 
> 07:29:17 2020        (r364806)
> > @@ -26,8 +26,6 @@
> >  #ifndef        _SYS_LIST_H
> >  #define        _SYS_LIST_H
> >
> > -#pragma ident  "%Z%%M% %I%     %E% SMI"
> > -
> >  #include <sys/list_impl.h>
> >
> >  #ifdef __cplusplus
> >
> > Modified: head/sys/contrib/openzfs/include/os/freebsd/spl/sys/list_impl.h
> > ===========================================================================
> ===
> > --- head/sys/contrib/openzfs/include/os/freebsd/spl/sys/list_impl.h     Wed
>  Aug 26 07:00:07 2020        (r364805)
> > +++ head/sys/contrib/openzfs/include/os/freebsd/spl/sys/list_impl.h     Wed
>  Aug 26 07:29:17 2020        (r364806)
> > @@ -27,8 +27,6 @@
> >  #ifndef        _SYS_LIST_IMPL_H
> >  #define        _SYS_LIST_IMPL_H
> >
> > -#pragma ident  "%Z%%M% %I%     %E% SMI"
> > -
> >  #include <sys/types.h>
> >
> >  #ifdef __cplusplus
> >
> > Modified: head/sys/contrib/openzfs/include/os/freebsd/spl/sys/zmod.h
> > ===========================================================================
> ===
> > --- head/sys/contrib/openzfs/include/os/freebsd/spl/sys/zmod.h  Wed Aug 26 
> 07:00:07 2020        (r364805)
> > +++ head/sys/contrib/openzfs/include/os/freebsd/spl/sys/zmod.h  Wed Aug 26 
> 07:29:17 2020        (r364806)
> > @@ -27,8 +27,6 @@
> >  #ifndef        _ZMOD_H
> >  #define        _ZMOD_H
> >
> > -#pragma ident  "%Z%%M% %I%     %E% SMI"
> > -
> >  #ifdef __cplusplus
> >  extern "C" {
> >  #endif
> >
> > Modified: head/sys/contrib/openzfs/module/os/freebsd/spl/list.c
> > ===========================================================================
> ===
> > --- head/sys/contrib/openzfs/module/os/freebsd/spl/list.c       Wed Aug 26 
> 07:00:07 2020        (r364805)
> > +++ head/sys/contrib/openzfs/module/os/freebsd/spl/list.c       Wed Aug 26 
> 07:29:17 2020        (r364806)
> > @@ -23,8 +23,6 @@
> >   * Use is subject to license terms.
> >   */
> >
> > -#pragma ident  "%Z%%M% %I%     %E% SMI"
> > -
> >  /*
> >   * Generic doubly-linked list implementation
> >   */
>