From owner-dev-commits-src-main@freebsd.org Mon Apr 26 20:12:34 2021 Return-Path: Delivered-To: dev-commits-src-main@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 258B05EEFB4; Mon, 26 Apr 2021 20:12:34 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (mail.vx.sk [144.76.20.103]) by mx1.freebsd.org (Postfix) with ESMTP id 4FTbfV03GKz4XW1; Mon, 26 Apr 2021 20:12:33 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id 8B77037B8C; Mon, 26 Apr 2021 22:12:27 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk by mail.vx.sk (amavisd-new, unix socket) with LMTP id r7ZahabX58vw; Mon, 26 Apr 2021 22:12:27 +0200 (CEST) Received: from [10.0.7.122] (188-167-101-78.dynamic.chello.sk [188.167.101.78]) by mail.vx.sk (Postfix) with ESMTPSA id 458E237B8B; Mon, 26 Apr 2021 22:12:27 +0200 (CEST) To: John Baldwin , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202104260110.13Q1AGM6048050@gitrepo.freebsd.org> <074cf85d-0e00-44ad-1d0e-de4be849a481@FreeBSD.org> From: Martin Matuska Subject: Re: git: 4b84b4cca472 - main - zfs: fix non-functional mismerges from vendor/openzfs Message-ID: <6b3eca71-95d3-fbcc-f876-106364558cdf@FreeBSD.org> Date: Mon, 26 Apr 2021 22:12:26 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <074cf85d-0e00-44ad-1d0e-de4be849a481@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Content-Language: en-US X-Rspamd-Queue-Id: 4FTbfV03GKz4XW1 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Apr 2021 20:12:34 -0000 Hi Johh, thank you very much for the notice. I am going submit the change=20 upstream to put this in sync. OpenZFS is now "the source" and this file is part of OpenZFS. We may=20 have local changes but the idea is to push to OpenZFS first, if not=20 absolutely necessary to have it in our tree first. If I as a copyright=20 holder write a webpage with open content and others may use my content,=20 it is unusual for a copyright holder to request changes on a derived=20 site and keep the original webpage unchanged. Martin On 26. 4. 2021 18:37, John Baldwin wrote: > On 4/25/21 6:10 PM, Martin Matuska wrote: >> The branch main has been updated by mm: >> >> URL:=20 >> https://cgit.FreeBSD.org/src/commit/?id=3D4b84b4cca472e482bc22d5e5c792= 8be5a1393c84 >> >> commit 4b84b4cca472e482bc22d5e5c7928be5a1393c84 >> Author:=C2=A0=C2=A0=C2=A0=C2=A0 Martin Matuska >> AuthorDate: 2021-04-26 01:05:13 +0000 >> Commit:=C2=A0=C2=A0=C2=A0=C2=A0 Martin Matuska >> CommitDate: 2021-04-26 01:05:13 +0000 >> >> =C2=A0=C2=A0=C2=A0=C2=A0 zfs: fix non-functional mismerges from vendor= /openzfs >> =C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 - fix copyright in m= odule/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:=C2=A0=C2=A0 Wed Oct 28 13:46:11 2020 +0000 > > =C2=A0=C2=A0=C2=A0 Drop "All rights reserved" from all my stuff.=C2=A0 = This includes > =C2=A0=C2=A0=C2=A0 Foundation copyrights, approved by emaste@.=C2=A0 It= does not include > =C2=A0=C2=A0=C2=A0 files which carry other people's copyrights; if you'= re one > =C2=A0=C2=A0=C2=A0 of those people, feel free to make similar change. > =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 Reviewed by:=C2=A0=C2=A0=C2=A0 em= aste, imp, gbe (manpages) > =C2=A0=C2=A0=C2=A0 Differential Revision:=C2=A0 https://reviews.freebsd= =2Eorg/D26980 > > Notes: > =C2=A0=C2=A0=C2=A0 svn path=3D/head/; revision=3D367105 > > It is not ethical (and possibly not legal) to undo the copyright > holder's explicit change.=C2=A0 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. >