Date: Tue, 8 Jun 2021 14:38:11 GMT From: Martin Matuska <mm@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 84b8d2bc9ba8 - stable/13 - zfs: merge openzfs/zfs@3522f57b6 (zfs-2.1-release) to stable/13 Message-ID: <202106081438.158EcB96097241@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=84b8d2bc9ba898c3c2939c25f83912a7547c0ea7 commit 84b8d2bc9ba898c3c2939c25f83912a7547c0ea7 Merge: cb5fe9aa9fa0 3522f57b6ada Author: Martin Matuska <mm@FreeBSD.org> AuthorDate: 2021-06-08 14:36:23 +0000 Commit: Martin Matuska <mm@FreeBSD.org> CommitDate: 2021-06-08 14:36:23 +0000 zfs: merge openzfs/zfs@3522f57b6 (zfs-2.1-release) to stable/13 This changes branch tracking of sys/contrib/openzfs to a new direct-import branch vendor/openzfs/zfs-2.1-release. 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/module/os/linux/zfs/zfs_uio.c | 3 --- sys/contrib/openzfs/scripts/zfs-images | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106081438.158EcB96097241>