From owner-dev-commits-src-main@freebsd.org Mon Apr 26 21:23:14 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 901FA5F125B for ; Mon, 26 Apr 2021 21:23:14 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 4FTdD23Mfjz4bq4 for ; Mon, 26 Apr 2021 21:23:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x735.google.com with SMTP id u20so25890898qku.10 for ; Mon, 26 Apr 2021 14:23:13 -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=kQHQwOddw1ywQA/r//O3ptcq7UcF6Q9W03Y1ivf+L6U=; b=I9WH2lCItIly5p+V0JNzrsLfvVgIZjQN6tXokfs4fnw5hqu6GOHyoQXurO+fp4vdmw Ef0oLHEwf7qaR1870pP/BgHF/LVj6XClcUxQkSDooMFMMSypy0mkuXocQlbpDU5UwnCk ugdmElLKUP+LXIftxwUPX1IeyTYgVI6ONKQjiRNyAXvoW4xziPJoeq3hwY9j+nuRAoyy NLyVZtRZrw489Uho4TJFiOHOP0JsqkE6DarvqofyyjszS+6/S8Fwx3sFDt/3UNKdajDB T0onSFgUxqf6Pnu3dRSW4mYaOK57mrkQjptT2fTpeUtduY2qS70Q72+i5RhVXs5QkMsy j2ng== 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=kQHQwOddw1ywQA/r//O3ptcq7UcF6Q9W03Y1ivf+L6U=; b=X4eLmUUJV80GjEfb5lXQyoveHc1re5fHx/wWAb3d1EAGZeZ+F+PXe6eZRTfqXWbXIZ k4GstegrODDKhPOlS7XUUcqIbFaymqQlP0Dd2NQ/ExjnldUfDZeoJ5bp6QgPbEtq3BKf vC9T78jNkTYAmNmfYOTZLRXPMZivNZrx+KkHOTlDRFqSMddg6KaJQMVtToK2Co9GkGTJ abV0kvl9vGap5L7joptJSMsMYpmLG0N1L6PoSBh8dnk8YeUp1i8y54bC9eqNarb4Rjoj asN+c14QRNnxAZYAai80LdWdTspnjKVsu0IoX46dVAaY/G1i2bAiJr8CkG8mMi/2IFIs 3V+w== X-Gm-Message-State: AOAM531COLJ22RnebmfQM2ZKNCOe4kCGo5Ed5qa/zUwuHXrlh/6fBEKK j8s9b3F2somZHE+9EPkOqHyQaS0wtaS7LzNk4Q6OJw== X-Google-Smtp-Source: ABdhPJzbxZ2VRQy9MqrYQVUjF15HbTiPwDrHd2+uhgux7EogoRyPNvFUAOExHJpIxo4HtXRqnmECv3YfafY1h81muz0= X-Received: by 2002:a05:620a:24c5:: with SMTP id m5mr19659799qkn.195.1619472193218; Mon, 26 Apr 2021 14:23:13 -0700 (PDT) MIME-Version: 1.0 References: <202104260110.13Q1AGM6048050@gitrepo.freebsd.org> <074cf85d-0e00-44ad-1d0e-de4be849a481@FreeBSD.org> <6b3eca71-95d3-fbcc-f876-106364558cdf@FreeBSD.org> In-Reply-To: <6b3eca71-95d3-fbcc-f876-106364558cdf@FreeBSD.org> From: Warner Losh Date: Mon, 26 Apr 2021 15:23:01 -0600 Message-ID: Subject: Re: git: 4b84b4cca472 - main - zfs: fix non-functional mismerges from vendor/openzfs To: Martin Matuska Cc: John Baldwin , src-committers , "" , dev-commits-src-main@freebsd.org X-Rspamd-Queue-Id: 4FTdD23Mfjz4bq4 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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 21:23:14 -0000 On Mon, Apr 26, 2021, 2:12 PM Martin Matuska wrote: > Hi Johh, > > thank you very much for the notice. I am going submit the change > upstream to put this in sync. > > OpenZFS is now "the source" and this file is part of OpenZFS. We may > have local changes but the idea is to push to OpenZFS first, if not > absolutely necessary to have it in our tree first. If I as a copyright > holder write a webpage with open content and others may use my content, > it is unusual for a copyright holder to request changes on a derived > site and keep the original webpage unchanged. > Yea, I think the author just changed the wrong copy of the file to remove all rights reserved, perhaps because he was unaware of the upstream relationship.... Your plan sounds good to me as long as we end back to the author's intent in the fullness of time. Warner 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: > >> > 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. > > > >