Diffusion FreeBSD src repository 6b04e2bedd33

14
6b04e2bedd33
Actions

Description

zfs: merge openzfs/zfs@2407f30bd (zfs-2.2-release) into stable/14

Notable upstream pull request merges:
#15290 33d7c2d16 import: require force when cachefile hostid doesn't

match on-disk

#15319 bcd010d3a Reduce number of metaslab preload taskq threads
#15339 1611b8e56 Add BTI landing pads to the AArch64 SHA2 assembly
#15340 bc77a0c85 ARC: Remove b_cv from struct l1arc_buf_hdr
#15347 3158b5d71 ARC: Drop different size headers for crypto
#15350 ba7797c8d ARC: Remove b_bufcnt/b_ebufcnt from ARC headers
#15353 9be8ddfb3 ZIL: Reduce maximum size of WR_COPIED to 7.5K
#15362 8495536f7 zfsconcepts: add description of block cloning

Obtained from: OpenZFS
OpenZFS commit: 2407f30bda96f7d61a32fc38c638b3eb5b216284
OpenZFS tag: zfs-2.2.0-rc5
Approved by: re (gjb)

(cherry picked from commit fdc38bc6cd28a56fbc82d6ca1d99f47569070b3a)

Details

Provenance

mm	Authored on Oct 8 2023, 7:58 AM

Parents

rG0002395c4efb: zfs: merge openzfs/zfs@8015e2ea6 (zfs-2.2-release) into stable/14

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rG6b04e2bedd33: zfs: merge openzfs/zfs@2407f30bd (zfs-2.2-release) into stable/14 (authored by mm).Oct 14 2023, 8:52 PM

Changes (30)

Path

Size

sys/

contrib/

openzfs/

zfs: merge openzfs/zfs@2407f30bd (zfs-2.2-release) into stable/146b04e2bedd33Actions

Description

Details

Event Timeline

Changes (30)

rG6b04e2bedd33

sys/contrib/openzfs/.cirrus.yml

sys/contrib/openzfs/.gitignore

sys/contrib/openzfs/META

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

sys/contrib/openzfs/config/zfs-build.m4

sys/contrib/openzfs/include/os/linux/zfs/sys/trace_arc.h

sys/contrib/openzfs/include/sys/arc_impl.h

sys/contrib/openzfs/include/sys/metaslab_impl.h

sys/contrib/openzfs/include/sys/spa_impl.h

sys/contrib/openzfs/man/man4/zfs.4

sys/contrib/openzfs/man/man7/zfsconcepts.7

sys/contrib/openzfs/module/icp/asm-aarch64/sha2/sha256-armv8.S

sys/contrib/openzfs/module/icp/asm-aarch64/sha2/sha512-armv8.S

sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c

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

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

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

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

sys/contrib/openzfs/rpm/generic/zfs.spec.in

sys/contrib/openzfs/tests/runfiles/common.run

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

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

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.cfg

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_unclean_export.ksh

sys/modules/zfs/zfs_config.h

sys/modules/zfs/zfs_gitrev.h

zfs: merge openzfs/zfs@2407f30bd (zfs-2.2-release) into stable/14
6b04e2bedd33
Actions