git: ed9215c8e05f - main - zfs: merge openzfs/zfs at 3522f57b6 (master) to main

[Martin Matuska]

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 <mm at FreeBSD.org>
AuthorDate: 2021-06-08 14:23:50 +0000
Commit:     Martin Matuska <mm at FreeBSD.org>
CommitDate: 2021-06-08 14:25:14 +0000

    zfs: merge openzfs/zfs at 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