From owner-svn-src-head@freebsd.org Wed Aug 26 17:43:16 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 5D6FF3B5B7A for ; Wed, 26 Aug 2020 17:43:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BcCrM2ctKz4Nwf for ; Wed, 26 Aug 2020 17:43:15 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x830.google.com with SMTP id y65so2102074qtd.2 for ; Wed, 26 Aug 2020 10:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=nYj00C9aJusmZUGmz76zRC062/e0NWALNx/+WIV0dH8=; b=q0Q9D8ieSywwbmzaJAvAwiXH/xFUykGjmLuSY23+lV1qXRYSSmdhkk0qmljj0Ikys4 Bryi6ew1KquzF8rN7+hrBlJM+GlBM2dODl4bVsCG1h8wmvVcmzkwbyW2pSisuumiNLYO GxvOu1qLF3HkUU4U2onPyt+21WyTyLq3GDK9GC1mZXZKEFLuNr8IJlegbKNy0e0e5+5T spnDmxN6l//pBOXNtQLhTrekjeF9f0xkZpC8KhhlOpf/snEoft+fZ18zp126mp02YeFw Xfbx5tDIFutNdMNFWUl+lmLVdoNVwgXXz+sq0N7g6dcP+yn5gji3UEGH47pk0z+ElIK5 SBIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=nYj00C9aJusmZUGmz76zRC062/e0NWALNx/+WIV0dH8=; b=nqbvent1wOcsghmaCLaoX/i3JFR8/zhVe11O05BqCC8ebJ8s9GfJn6k3Uzy+N06hWf TZdZDogFEosurxV0B62DkdM/LhabEqNfH8FCWFuIsqVUIj/f5VZv0acKtptNNfcd6qPk jODeH61BVGaQdPqOdTY/mIkYza/rPSCrpz8pDhNPDB0EEM40IKS7yEFooTQ7wP+X0xGP UsV/DUfr4SBNUA9BXUH2dMVmmZVBKb3k31LdSMqqO1Kk2GFQcvSf1Ewm36mzgE47+bDR aOsc6vmKwrOusVgHS7i4LNSMkY1CPCR8SAnDIo1xIBTndGwl5uV9Leblz3Yru2+Q/BBn AMOA== X-Gm-Message-State: AOAM533ZYnUWd/ueSybphoGOYRj701Cf4n+QgBMA7lgNIGuNb+tyZyRL iD8f6w4ltrHf1/lhqoW0eQS81n7auFKvrQCYE2brxg== X-Google-Smtp-Source: ABdhPJze8RErX6356bKse+0pPgXKq/MeEqOFgLuF+iVz+XKdKIgAt0Oslu2cuG7UB2h4Y+NiAbDB65KAzuawndBOk1o= X-Received: by 2002:ac8:4719:: with SMTP id f25mr15420642qtp.291.1598463793981; Wed, 26 Aug 2020 10:43:13 -0700 (PDT) MIME-Version: 1.0 References: <202008260729.07Q7THlo023745@repo.freebsd.org> In-Reply-To: From: Warner Losh Date: Wed, 26 Aug 2020 11:43:03 -0600 Message-ID: Subject: Re: svn commit: r364806 - in head/sys/contrib/openzfs: include/os/freebsd/spl/sys module/os/freebsd/spl To: John Baldwin Cc: Matthew Macy , Toomas Soome , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 4BcCrM2ctKz4Nwf X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=q0Q9D8ie; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::830) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-0.44 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-0.74)[-0.737]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; NEURAL_HAM_LONG(-0.10)[-0.100]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::830:from]; NEURAL_SPAM_SHORT(0.40)[0.397]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; DMARC_NA(0.00)[bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[svn-src-head]; FREEMAIL_CC(0.00)[gmail.com,freebsd.org] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 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:43:16 -0000 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 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 > 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 >