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.
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 <[email protected]>
AuthorDate: 2021-04-26 01:05:13 +0000
Commit: Martin Matuska <[email protected]>
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 <[email protected]>
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.
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "[email protected]"
