From owner-dev-commits-src-all@freebsd.org Tue Jun 8 14:26:13 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 10C8263850F; Tue, 8 Jun 2021 14:26:13 +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 4Fzsx05YQSz3BqD; Tue, 8 Jun 2021 14:26:12 +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 A6F9824DA; Tue, 8 Jun 2021 14:26:12 +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 158EQC6o081380; Tue, 8 Jun 2021 14:26:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 158EQChA081379; Tue, 8 Jun 2021 14:26:12 GMT (envelope-from git) Date: Tue, 8 Jun 2021 14:26:12 GMT Message-Id: <202106081426.158EQChA081379@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: ed9215c8e05f - main - zfs: merge openzfs/zfs@3522f57b6 (master) to main 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: ed9215c8e05f06c00683bb0624e82644796d4385 Auto-Submitted: auto-generated 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: Tue, 08 Jun 2021 14:26:13 -0000 The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=ed9215c8e05f06c00683bb0624e82644796d4385 commit ed9215c8e05f06c00683bb0624e82644796d4385 Merge: 97993d1ebf59 3522f57b6ada Author: Martin Matuska AuthorDate: 2021-06-08 14:23:50 +0000 Commit: Martin Matuska CommitDate: 2021-06-08 14:25:14 +0000 zfs: merge openzfs/zfs@3522f57b6 (master) to main This changes branch tracking of sys/contrib/openzfs to a new direct-import branch vendor/openzfs/master. No functional changes. OpenZFS tag: 2.1.0-rc1 sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 1 + sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 1 + sys/contrib/openzfs/scripts/zfs-images | 1 + 3 files changed, 3 insertions(+) diff --cc sys/contrib/openzfs/scripts/zfs-images index 000000000000,3331601f6dc5..3331601f6dc5 mode 000000,160000..160000 --- a/sys/contrib/openzfs/scripts/zfs-images +++ b/sys/contrib/openzfs/scripts/zfs-images