From owner-dev-commits-src-all@freebsd.org Mon Apr 26 16:37:31 2021 Return-Path: Delivered-To: dev-commits-src-all@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 6D5885E707B; Mon, 26 Apr 2021 16:37:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FTVtM2k1pz3qK4; Mon, 26 Apr 2021 16:37:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id D1F0B221B7; Mon, 26 Apr 2021 16:37:30 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: git: 4b84b4cca472 - main - zfs: fix non-functional mismerges from vendor/openzfs To: Martin Matuska , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202104260110.13Q1AGM6048050@gitrepo.freebsd.org> From: John Baldwin Message-ID: <074cf85d-0e00-44ad-1d0e-de4be849a481@FreeBSD.org> Date: Mon, 26 Apr 2021 09:37:26 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <202104260110.13Q1AGM6048050@gitrepo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Apr 2021 16:37:31 -0000 On 4/25/21 6:10 PM, Martin Matuska wrote: > The branch main has been updated by mm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=4b84b4cca472e482bc22d5e5c7928be5a1393c84 > > commit 4b84b4cca472e482bc22d5e5c7928be5a1393c84 > Author: Martin Matuska > AuthorDate: 2021-04-26 01:05:13 +0000 > Commit: Martin Matuska > CommitDate: 2021-04-26 01:05:13 +0000 > > zfs: fix non-functional mismerges from vendor/openzfs > > - fix copyright in module/os/freebsd/spl/spl_acl.c Strictly speaking you broke the copyright. This line was explicitly dropped by the copyright holder: commit bce7ee9d412b6410e6d799c4a417617cbb148e09 Author: Edward Tomasz Napierala Date: Wed Oct 28 13:46:11 2020 +0000 Drop "All rights reserved" from all my stuff. This includes Foundation copyrights, approved by emaste@. It does not include files which carry other people's copyrights; if you're one of those people, feel free to make similar change. Reviewed by: emaste, imp, gbe (manpages) Differential Revision: https://reviews.freebsd.org/D26980 Notes: svn path=/head/; revision=367105 It is not ethical (and possibly not legal) to undo the copyright holder's explicit change. If you want to reduce the diff with upstream, then push this local change to remove this line upstream instead. Note that the original commit is in line with a recent-ish change in the Project's license policy to discourage the use of the "All rights reserved" line as antiquated and obsolete, and that it has been dropped from all of the Project's recommended license. -- John Baldwin