]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
zfs: merge openzfs/zfs@3522f57b6 (master)
authorMartin Matuska <mm@FreeBSD.org>
Wed, 14 Apr 2021 10:49:10 +0000 (12:49 +0200)
committerMartin Matuska <mm@FreeBSD.org>
Wed, 14 Apr 2021 10:51:51 +0000 (12:51 +0200)
commit6db169e920810bf1d7e9bd2fad5da92bfb696677
treef0150cc8730eb3e32d0462e6546a176a9eba3b19
parent6678e75e4ff9026357950e97964e901d807578a5
parentd76d37d9c3f33de9155c16f3b1eceb288c0702a0
zfs: merge openzfs/zfs@3522f57b6 (master)

Notable upstream pull request merges:
  #11742 When specifying raidz vdev name, parity count should match
  #11744 Use a helper function to clarify gang block size
  #11771 Support running FreeBSD buildworld on Arm-based macOS hosts

This is the last update that will be MFCed into stable/13.

From now on, the tracking of OpenZFS branches will be different:
- main continues tracking openzfs/zfs/master
- stable/13 is going to track openzfs/zfs/zfs-2.1-release

Obtained from: OpenZFS
MFC after: 1 week
28 files changed:
sys/contrib/openzfs/.editorconfig
sys/contrib/openzfs/.gitignore
sys/contrib/openzfs/.gitmodules
sys/contrib/openzfs/META
sys/contrib/openzfs/cmd/raidz_test/raidz_bench.c
sys/contrib/openzfs/cmd/zed/zed_exec.c
sys/contrib/openzfs/cmd/zfs/zfs_main.c
sys/contrib/openzfs/cmd/zpool/os/linux/zpool_vdev_os.c
sys/contrib/openzfs/contrib/pyzfs/libzfs_core/test/test_libzfs_core.py
sys/contrib/openzfs/include/sys/dmu_recv.h
sys/contrib/openzfs/include/sys/dmu_send.h
sys/contrib/openzfs/include/sys/spa.h
sys/contrib/openzfs/include/sys/vdev.h
sys/contrib/openzfs/lib/libspl/include/sys/dklabel.h
sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c
sys/contrib/openzfs/lib/libzfs/libzfs_pool.c
sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c
sys/contrib/openzfs/lib/libzutil/os/linux/zutil_import_os.c
sys/contrib/openzfs/lib/libzutil/zutil_import.c
sys/contrib/openzfs/man/man8/zed.8.in
sys/contrib/openzfs/module/os/linux/zfs/arc_os.c
sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c
sys/contrib/openzfs/module/zfs/arc.c
sys/contrib/openzfs/module/zfs/dmu_recv.c
sys/contrib/openzfs/module/zfs/fm.c
sys/contrib/openzfs/module/zfs/metaslab.c
sys/contrib/openzfs/module/zfs/zio.c
sys/modules/zfs/zfs_config.h