From owner-svn-src-head@freebsd.org Wed Aug 26 17:29:49 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A87FB3B5451; Wed, 26 Aug 2020 17:29:49 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BcCXr1g2Gz4McG; Wed, 26 Aug 2020 17:29:47 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id AzF1kqqSeng7KAzF3k2UgE; Wed, 26 Aug 2020 11:29:45 -0600 X-Authority-Analysis: v=2.3 cv=ecemg4MH c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=y4yBn9ojGxQA:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=4wgsC2hmVBIfBVsB2CoA:9 a=89Yf-Dv4xqrt60fL:21 a=CjuIK1q_8ugA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 3B8D553B; Wed, 26 Aug 2020 10:29:43 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 07QHTgfB008169; Wed, 26 Aug 2020 10:29:43 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202008261729.07QHTgfB008169@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Matthew Macy cc: Toomas Soome , src-committers , svn-src-all , svn-src-head Subject: Re: svn commit: r364806 - in head/sys/contrib/openzfs: include/os/freebsd/spl/sys module/os/freebsd/spl In-reply-to: References: <202008260729.07Q7THlo023745@repo.freebsd.org> Comments: In-reply-to Matthew Macy message dated "Wed, 26 Aug 2020 10:15:21 -0700." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 26 Aug 2020 10:29:42 -0700 X-CMAE-Envelope: MS4wfGRjMJUAx/IFXqooM/WonBAVmgZdVH11a0uKCyOydhALdlrrkURXI2XzKrk78Al+11LFTYeAwXgDvwp7aJtCf04SC3Ao/QVxM6RyhdNEtmiy7vfKM24e 3PEWK6GDHMkNcRkSpXJwAmPTHcpstF0KKO64FRYute36X3B2auiKGDBJW5nknZdgjlTzERirKrfVPTApVAOqxEa3at7TX3w1GHE8kcZ+p+2qW9Mng8kAe2xq w/NwjsCUFnQMn2BV0YtmAmqWmnJ2uACGZ+zHdr61LzFoW+iRpnVEcul3GNyM3APtq6Rwttb3I+LrcL0gl2vO3Q== X-Rspamd-Queue-Id: 4BcCXr1g2Gz4McG X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 64.59.134.9) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [1.33 / 15.00]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[64.59.134.9:from]; MV_CASE(0.50)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[4]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-0.03)[-0.034]; FREEMAIL_TO(0.00)[gmail.com]; RECEIVED_SPAMHAUS_PBL(0.00)[70.67.125.17:received]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_LOW(-0.10)[64.59.134.9:from]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.05)[-0.051]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; AUTH_NA(1.00)[]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_SPAM_LONG(0.11)[0.111]; RCVD_TLS_LAST(0.00)[]; R_SPF_NA(0.00)[no SPF record]; MAILMAN_DEST(0.00)[svn-src-all,svn-src-head] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Aug 2020 17:29:49 -0000 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 FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. In message , 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 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 > > #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 > > > > #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 > > > > #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 > > */ >