CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit

]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit

projects / FreeBSD / FreeBSD.git / commit

author	Martin Matuska <mm@FreeBSD.org>
	Thu, 25 Aug 2022 22:57:16 +0000 (00:57 +0200)
committer	Martin Matuska <mm@FreeBSD.org>
	Thu, 25 Aug 2022 22:58:56 +0000 (00:58 +0200)
commit	08aba0aec7b7f676ccc3f7886f59f277d668d5b4
tree	98cd87023a4ea28dc9a72fc6a810e02997cd4b6f	tree \| snapshot
parent	7ccdad905f30e90606e11104d46e39c9a6405279	commit \| diff
parent	a582d52993134905f2e96cebe7aff410f29b1ad8	commit \| diff

zfs: merge openzfs/zfs@a582d5299

Notable upstream pull request merges:
  #13717 Fix zpool status in case of unloaded keys
  #13753 Prevent zevent list from consuming all of kernel memory
  #13767 arcstat: fix -p option
  #13785 Updates for snapshots_changed property

Obtained from: OpenZFS
OpenZFS commit: a582d52993134905f2e96cebe7aff410f29b1ad8

28 files changed:

sys/contrib/openzfs/cmd/arcstat.in	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/cmd/zed/zed_conf.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/cmd/zed/zed_conf.h	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/cmd/zed/zed_event.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/contrib/dracut/90zfs/zfs-snapshot-bootfs.service.in	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/include/sys/dsl_crypt.h	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/man/man7/zfsprops.7	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/man/man7/zpool-features.7	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/man/man8/zed.8.in	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zcommon/zfs_prop.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/dsl_crypt.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/dsl_dataset.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/dsl_destroy.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/dsl_dir.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/spa_errlog.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/runfiles/common.run	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/atime/atime_001_pos.ksh	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/atime/atime_003_pos.ksh	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/atime/root_atime_on.ksh	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/atime/root_relatime_on.ksh	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cache/cache_012_pos.ksh	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_003_pos.ksh	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_004_pos.ksh	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_005_pos.ksh	\|	diff2 \|	blob \| history
sys/modules/zfs/zfs_config.h	diff1 \|	\|	blob \| history
sys/modules/zfs/zfs_gitrev.h	diff1 \|	\|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

sys/contrib/openzfs/cmd/arcstat.in	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/cmd/zed/zed_conf.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/cmd/zed/zed_conf.h	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/cmd/zed/zed_event.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/contrib/dracut/90zfs/zfs-snapshot-bootfs.service.in	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/include/sys/dsl_crypt.h	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/man/man7/zfsprops.7	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/man/man7/zpool-features.7	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/man/man8/zed.8.in	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zcommon/zfs_prop.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/dsl_crypt.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/dsl_dataset.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/dsl_destroy.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/dsl_dir.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/spa_errlog.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/runfiles/common.run	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/atime/atime_001_pos.ksh	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/atime/atime_003_pos.ksh	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/atime/root_atime_on.ksh	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/atime/root_relatime_on.ksh	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cache/cache_012_pos.ksh	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_003_pos.ksh	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_004_pos.ksh	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_005_pos.ksh	\|	diff2 \|	blob \| history
sys/modules/zfs/zfs_config.h	diff1 \|	\|	blob \| history
sys/modules/zfs/zfs_gitrev.h	diff1 \|	\|	blob \| history