HomeFreeBSD
Diffusion FreeBSD src repository b31ac0350909

zfs: merge openzfs/zfs@5f3069867 (zfs-2.2-release) into stable/14
b31ac0350909
Actions

Description

zfs: merge openzfs/zfs@5f3069867 (zfs-2.2-release) into stable/14

Notable upstream pull request merges:

#15248 cc75c816c Fix l2arc_apply_transforms ztest crash
#15273 6d9bc3ec9 Fix occasional rsend test crashes
#15288 f63683fe0 cmd: add 'help' subcommand to zpool and zfs
#15297 a199cac6c status: report pool suspension state under
                 failmode=continue

Approved by: re (gjb)
Obtained from: OpenZFS
OpenZFS commit: 5f30698670dec3fc2085663677021f0a592cf081

(cherry picked from commit 6cfb90c6ebe4c2eb8de4abad679289b9a6c7aae2)

Details

Provenance
mmAuthored on Sep 24 2023, 10:26 PM
Parents
rG636c1933fe69: zfs: update share/zfs/compatibility.d to match current ZFS code
Branches
Unknown
Tags
Unknown

Changes (12)

PathSize
sys/
contrib/
openzfs/
cmd/
zfs/
zpool/
lib/
libzfs/
libzfs_core/
module/
zfs/
tests/
zfs-tests/
tests/
functional/
block_cloning/
cli_root/
zfs_program/
modules/
zfs/

rGb31ac0350909

View Options

sys/contrib/openzfs/cmd/zfs/zfs_main.c

Loading...
View Options

sys/contrib/openzfs/cmd/zpool/zpool_main.c

Loading...
View Options

sys/contrib/openzfs/cmd/ztest.c

Loading...
View Options

sys/contrib/openzfs/lib/libzfs/libzfs_pool.c

Loading...
View Options

sys/contrib/openzfs/lib/libzfs_core/libzfs_core.c

Loading...
View Options

sys/contrib/openzfs/module/zfs/arc.c

Loading...
View Options

sys/contrib/openzfs/module/zfs/spa_misc.c

Loading...
View Options

sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am

Loading...
View Options

sys/contrib/openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh

Loading...
View Options

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh

Loading...
View Options

sys/modules/zfs/zfs_config.h

Loading...
View Options

sys/modules/zfs/zfs_gitrev.h

Loading...