From owner-dev-commits-src-main@freebsd.org Mon Apr 26 20:17:21 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 C91075EF416; Mon, 26 Apr 2021 20:17:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FTbm15LtTz4XZj; Mon, 26 Apr 2021 20:17:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AA7F75A6C; Mon, 26 Apr 2021 20:17:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13QKHLPf073157; Mon, 26 Apr 2021 20:17:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13QKHL69073156; Mon, 26 Apr 2021 20:17:21 GMT (envelope-from git) Date: Mon, 26 Apr 2021 20:17:21 GMT Message-Id: <202104262017.13QKHL69073156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 9f1dc86c46d6 - main - zfs: restore copyright disclaimer change from 4b84b4cca MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f1dc86c46d69d31a819fa150ce1d91fb987a61b Auto-Submitted: auto-generated 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:17:21 -0000 The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=9f1dc86c46d69d31a819fa150ce1d91fb987a61b commit 9f1dc86c46d69d31a819fa150ce1d91fb987a61b Author: Martin Matuska AuthorDate: 2021-04-26 20:03:30 +0000 Commit: Martin Matuska CommitDate: 2021-04-26 20:16:50 +0000 zfs: restore copyright disclaimer change from 4b84b4cca The change will be pull-requested to upstream. X-MFC-with: 4b84b4cca472e482bc22d5e5c7928be5a1393c84 --- sys/contrib/openzfs/module/os/freebsd/spl/spl_acl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/spl/spl_acl.c b/sys/contrib/openzfs/module/os/freebsd/spl/spl_acl.c index 18188ca0adec..74c26d03f87f 100644 --- a/sys/contrib/openzfs/module/os/freebsd/spl/spl_acl.c +++ b/sys/contrib/openzfs/module/os/freebsd/spl/spl_acl.c @@ -1,6 +1,5 @@ /* * Copyright (c) 2008, 2009 Edward Tomasz Napierała - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions