Diffusion FreeBSD src repository 6cfb90c6ebe4

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

Tags

None

Referenced Files

None

Subscribers

None

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

Obtained from: OpenZFS
OpenZFS commit: 5f30698670dec3fc2085663677021f0a592cf081

Details

Provenance

mm	Authored on Sep 24 2023, 10:26 PM

Parents

rG3024443da584: dummynet: fix comment typo
rG5f30698670de: tests/block_cloning: try harder to stay on same txg in fallback test

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rG6cfb90c6ebe4: zfs: merge openzfs/zfs@5f3069867 (zfs-2.2-release) into stable/14 (authored by mm).Sep 24 2023, 10:55 PM

mm mentioned this in rGb31ac0350909: zfs: merge openzfs/zfs@5f3069867 (zfs-2.2-release) into stable/14.Sep 27 2023, 10:45 PM

Merged Changes

5f30698670de tests/block_cloning: try harder to stay on same txg in fallback test
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
a199cac6cdd7 status: report pool suspension state under failmode=continue
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
729507d309d4 Fix occasional rsend test crashes
Author
pcd_delphix.com
Browse Repository
No Builds
No Audits
3af63683fe07 cmd: add 'help' subcommand to zpool and zfs
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
9aa1a2878ea9 Fix incorrect expected error in ztest
Author
pcd_delphix.com
Browse Repository
No Builds
No Audits
cc75c816c539 Fix l2arc_apply_transforms ztest crash
Author
pcd_delphix.com
Browse Repository
No Builds
No Audits
1c2aee7a5222 tests: install missing PAM tests
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits

Changes (12)

Path

Size

sys/

contrib/

openzfs/

cmd/

zfs/

zpool/

lib/

libzfs/

libzfs_core/

module/

zfs/

tests/

zfs-tests/

tests/

functional/

block_cloning/

block_cloning_copyfilerange_fallback_same_txg.ksh

cli_root/

zfs_program/

zfs_program_json.ksh

modules/

zfs/

rG6cfb90c6ebe4

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

Loading...

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

Loading...

sys/contrib/openzfs/cmd/ztest.c

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

sys/modules/zfs/zfs_config.h

Loading...

sys/modules/zfs/zfs_gitrev.h

Loading...