Diffusion FreeBSD src repository 6abe6a8a0d54

zfs: merge openzfs/zfs@3e4a3e161 (zfs-2.2-release) into stable/14
6abe6a8a0d54
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

zfs: merge openzfs/zfs@3e4a3e161 (zfs-2.2-release) into stable/14

OpenZFS release 2.2.8

Notable upstream pull request merges:
#17180 0a73e91d2 Block remap for cloned blocks on device removal
#17255 be72364ad ARC: Avoid overflows in arc_evict_adj()
#17273 4ee13684b cred: properly pass and test creds on other threads
#17340 b144b160b Fix 2 bugs in non-raw send with encryption
#17343 050517c41 icp: Use explicit_memset() exclusively in gcm_clear_ctx()
#17353 827fd20d0 dmu_objset_hold_flags() should call

dsl_dataset_rele_flags() on error

Obtained from: OpenZFS
OpenZFS commit: 3e4a3e161c00273303cd9fa9e0dc09ead3499a8a
OpenZFS tag: zfs-2.2.8

Details

Provenance

mm	Authored on Jun 21 2025, 10:05 PM

Parents

rG3e4a3e161c00: Tag zfs-2.2.8
rGef360183df81: qat: update API files to use SPDX identifier

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rG6abe6a8a0d54: zfs: merge openzfs/zfs@3e4a3e161 (zfs-2.2-release) into stable/14 (authored by mm).Jun 21 2025, 10:22 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

3e4a3e161c00 Tag zfs-2.2.8
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
21ad6444c77e ZTS: Enable io_uring on CentOS Stream 9 and 10 also
Author
Tino Reichardt <milky-zfs@mcmilk.de>
Browse Repository
No Builds
No Audits
b608b9524774 Linux build: silence objtool warnings
Author
Attila Fülöp <attila@fueloep.org>
Browse Repository
No Builds
No Audits
d0ea4c617b18 linux/zvol_os: don't try to set disk ops if alloc fails
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
023a43253c3b ZTS: testing for leaked key mappings in encrypted non-raw send
Author
g_amanakis_yahoo.com
Browse Repository
No Builds
No Audits
4ee13684b921 cred: properly pass and test creds on other threads (#17273)
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
0a73e91d2c80 Block remap for cloned blocks on device removal
Author
mav
Browse Repository
No Builds
No Audits
b7e24dc13651 CI: Retire Fedora 40 builder
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
12f150851bad ZTS: Enable io_uring support on el9/el10
Author
Tino Reichardt <milky-zfs@mcmilk.de>
Browse Repository
No Builds
No Audits
564b641f88d1 ZTS: Add AlmaLinux 10
Author
Tino Reichardt <milky-zfs@mcmilk.de>
Browse Repository
No Builds
No Audits
50a027f798f3 CI: Retire Ubuntu 20.04 builder
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
c1848f7261a9 Linux build: always use objtool
Author
Attila Fülöp <attila@fueloep.org>
Browse Repository
No Builds
No Audits
d92827b820ee Linux 6.15 compat: META
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
c81e37f15db3 [zfs-2.2.8] Revert "vdev_disk: default to classic submission for 2.2.x"
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
000236716af9 ZTS: Stop zpool_status tests from spamming stdout (#17292)
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
93af4971207b [zfs-2.2.8] GCC: Fix array subscript check
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
5b93750f6f12 Linux 6.14 compat: META (#17098) (#17172)
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
0765d247359f Linux 6.13 compat: META (#17098)
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
81c62bc9e593 GCC 15: Fix unterminated-string-initialization (#17244)
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
dcabac71e8d6 debian: Add libtirpc-dev dependency (#17220)
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
79cbdb370305 contrib/initramfs: use LVM autoactivation for activating VGs (#17125)
Author
Friedrich Weber <56110206+frwbr@users.noreply.github.com>
Browse Repository
No Builds
No Audits
3d087fde6e96 Use <fcntl.h> instead of <sys/fcntl.h>
Author
Sam James <sam@gentoo.org>
Browse Repository
No Builds
No Audits
b800ad856ef9 Fix zoneid when USER_NS is disabled
Author
Wraithh <github@ilkka.kapsi.fi>
Browse Repository
No Builds
No Audits
c4f7df826646 ZTS: Remove non-standard awk hex numbers usage
Author
mav
Browse Repository
No Builds
No Audits
3b58dd5e1aa2 RPM: Hold back incompatible kernel packages on Fedora
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
f86e7140685c Support for cross-compiling kernel modules
Author
n0-1 <p.github@nwl.cc>
Browse Repository
No Builds
No Audits
92ae463715cd fix: block incompatible kernel from being installed
Author
tleydxdy <shironeko.github@tesaguri.club>
Browse Repository
No Builds
No Audits
b86e4bdeb931 Add Quality Assurance to pull request template
Author
Richard Yao <richard@ryao.dev>
Browse Repository
No Builds
No Audits
0b742a94cad9 runners: Add option to install custom kernel on Fedora
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
ebab942b13bd ZTS: Optimize KSM on Linux and remove it for FreeBSD
Author
Tino Reichardt <milky-zfs@mcmilk.de>
Browse Repository
No Builds
No Audits
254b6f35191e ZTS: Use Ubuntu default url for cloud-image
Author
Tino Reichardt <milky-zfs@mcmilk.de>
Browse Repository
No Builds
No Audits
2281350b5162 ZTS: Update FreeBSD version numbers
Author
Tino Reichardt <milky-zfs@mcmilk.de>
Browse Repository
No Builds
No Audits
d122a9f2e8cc CI: Add Fedora 42 runner (#17249)
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
bc01722a19a6 runners: Fix tarball build for zfs-qemu-packages workflow (#17158)
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
7a008070c0c9 runners: Fix zfs-release RPM creation (#17173)
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
e6463a6281da CI: Remove FreeBSD 13.3 and 14.1 tests (#17162)
Author
mav
Browse Repository
No Builds
No Audits
3587fc6c94e9 Add 'zfs-qemu-packages' workflow for RPM building
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
6a91dd3d1a72 ZTS: add centos stream10 (#16904)
Author
James Reilly <jreilly1821@gmail.com>
Browse Repository
No Builds
No Audits
e7876b0dc963 CI: Fix FreeBSD 13.4 STABLE build
Author
Tino Reichardt <milky-zfs@mcmilk.de>
Browse Repository
No Builds
No Audits
5de9d00311b6 CI: Add FreeBSD 14.2 RELEASE+STABLE builds
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
e665098c8588 CI: Automate some GitHub PR status labels manipulations
Author
mav
Browse Repository
No Builds
No Audits
be72364ad64a ARC: Avoid overflows in arc_evict_adj() (#17255)
Author
mav
Browse Repository
No Builds
No Audits
827fd20d07a4 dmu_objset_hold_flags() should call dsl_dataset_rele_flags() on error
Author
Richard Yao <richard@ryao.dev>
Browse Repository
No Builds
No Audits
3a84c630f236 Linux 6.2/6.15: del_timer_sync() renamed to timer_delete_sync()
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
3f94332a7ada Linux 6.15: mkdir now returns struct dentry *
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
050517c41b0c icp: Use explicit_memset() exclusively in gcm_clear_ctx()
Author
Richard Yao <richard@ryao.dev>
Browse Repository
No Builds
No Audits
b144b160b652 Fix 2 bugs in non-raw send with encryption
Author
g_amanakis_yahoo.com
Browse Repository
No Builds
No Audits
20bf8c6638d0 Linux: Stop using NR_FILE_PAGES for ARC scaling
Author
mav
Browse Repository
No Builds
No Audits
c88e5a380c6a Linux 6.0 compat: Check for migratepage VFS
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
8d19d971bc69 Use simple folio migration function
Author
tstabrawa <59430211+tstabrawa@users.noreply.github.com>
Browse Repository
No Builds
No Audits

Changes (94)

Path

Size

sys/

contrib/

openzfs/

.github/

PULL_REQUEST_TEMPLATE.md

workflows/

checkstyle.yaml

scripts/

generate-ci-type.py

qemu-1-setup.sh

qemu-2-start.sh

	qemu-3-deps-vm.sh
	qemu-3-deps.sh

qemu-4-build-vm.sh

qemu-4-build.sh

qemu-5-setup.sh

qemu-6-tests.sh

qemu-7-prepare.sh

qemu-8-summary.sh

qemu-prepare-for-build.sh

qemu-test-repo-vm.sh

qemu-wait-for-vm.sh

replace-dupes-with-symlinks.sh

zfs-qemu-packages.yml

cmd/

zpool/

os/

linux/

zpool_vdev_os.c

config/

kernel-automount.m4

kernel-kthread.m4

kernel-mkdir.m4

kernel-objtool.m4

kernel-sb-dying.m4

kernel-timer.m4

kernel-vfs-migrate_folio.m4

kernel-vfs-migratepage.m4

contrib/

debian/

initramfs/

scripts/

local-top/

include/

os/

freebsd/

spl/

sys/

linux/

kernel/

linux/

blkdev_compat.h

spl/

sys/

zfs/

sys/

sys/

lib/

libspl/

os/

linux/

libzpool/

man/

man4/

module/

icp/

algs/

modes/

asm-x86_64/

modes/

aesni-gcm-x86_64.S

sha2/

sha256-x86_64.S

sha512-x86_64.S

os/

freebsd/

spl/

linux/

spl/

zfs/

zcommon/

zfs/

rpm/

generic/

zfs-dkms.spec.in

zfs-kmod.spec.in

redhat/

zfs-kmod.spec.in

tests/

runfiles/

zfs-tests/

cmd/

file/

include/

tests/

functional/

cli_root/

zpool_status/

zpool_status_003_pos.ksh

zpool_status_004_pos.ksh

io/

rsend/

send_leak_keymaps.ksh

modules/

zfs/

rG6abe6a8a0d54

sys/contrib/openzfs/.github/PULL_REQUEST_TEMPLATE.md

Loading...

sys/contrib/openzfs/.github/workflows/checkstyle.yaml

Loading...

sys/contrib/openzfs/.github/workflows/labels.yml

Loading...

sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py

Loading...

sys/contrib/openzfs/.github/workflows/scripts/qemu-1-setup.sh

Loading...

sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh

Loading...

sys/contrib/openzfs/.github/workflows/scripts/qemu-3-deps-vm.sh

Loading...

sys/contrib/openzfs/.github/workflows/scripts/qemu-3-deps.sh

Loading...

sys/contrib/openzfs/.github/workflows/scripts/qemu-4-build-vm.sh

Loading...

sys/contrib/openzfs/.github/workflows/scripts/qemu-4-build.sh

Loading...

sys/contrib/openzfs/.github/workflows/scripts/qemu-5-setup.sh

Loading...

sys/contrib/openzfs/.github/workflows/scripts/qemu-6-tests.sh

Loading...

sys/contrib/openzfs/.github/workflows/scripts/qemu-7-prepare.sh

Loading...

sys/contrib/openzfs/.github/workflows/scripts/qemu-8-summary.sh

Loading...

sys/contrib/openzfs/.github/workflows/scripts/qemu-prepare-for-build.sh

Loading...

sys/contrib/openzfs/.github/workflows/scripts/qemu-test-repo-vm.sh

Loading...

sys/contrib/openzfs/.github/workflows/scripts/qemu-wait-for-vm.sh

Loading...

sys/contrib/openzfs/.github/workflows/scripts/replace-dupes-with-symlinks.sh

Loading...

sys/contrib/openzfs/.github/workflows/zfs-qemu-packages.yml

Loading...

sys/contrib/openzfs/.github/workflows/zfs-qemu.yml

Loading...

sys/contrib/openzfs/.github/workflows/zloop.yml

Loading...

sys/contrib/openzfs/META

Loading...

sys/contrib/openzfs/cmd/zpool/os/linux/zpool_vdev_os.c

Loading...

sys/contrib/openzfs/config/kernel-automount.m4

Loading...

sys/contrib/openzfs/config/kernel-kthread.m4

Loading...

sys/contrib/openzfs/config/kernel-mkdir.m4

Loading...

sys/contrib/openzfs/config/kernel-objtool.m4

Loading...

sys/contrib/openzfs/config/kernel-sb-dying.m4

Loading...

sys/contrib/openzfs/config/kernel-timer.m4

Loading...

sys/contrib/openzfs/config/kernel-vfs-migrate_folio.m4

Loading...

sys/contrib/openzfs/config/kernel-vfs-migratepage.m4

Loading...

sys/contrib/openzfs/config/kernel.m4

Loading...

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

Loading...

sys/contrib/openzfs/contrib/debian/control

Loading...

sys/contrib/openzfs/contrib/initramfs/scripts/local-top/zfs

Loading...

sys/contrib/openzfs/include/os/freebsd/spl/sys/policy.h

Loading...

sys/contrib/openzfs/include/os/linux/kernel/linux/blkdev_compat.h

Loading...

sys/contrib/openzfs/include/os/linux/kernel/linux/page_compat.h

Loading...

sys/contrib/openzfs/include/os/linux/spl/sys/taskq.h

Loading...

sys/contrib/openzfs/include/os/linux/spl/sys/uio.h

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/include/sys/dmu_recv.h

Loading...

sys/contrib/openzfs/include/sys/dsl_dataset.h

Loading...

sys/contrib/openzfs/include/sys/dsl_dir.h

Loading...

sys/contrib/openzfs/include/sys/frame.h

Loading...

sys/contrib/openzfs/include/sys/zcp.h

Loading...

sys/contrib/openzfs/include/sys/zfs_context.h

Loading...

sys/contrib/openzfs/lib/libspl/os/linux/zone.c

Loading...

sys/contrib/openzfs/lib/libzpool/kernel.c

Loading...

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

Loading...

sys/contrib/openzfs/module/Kbuild.in

Loading...

sys/contrib/openzfs/module/Makefile.in

Loading...

sys/contrib/openzfs/module/icp/algs/modes/modes.c

Loading...

sys/contrib/openzfs/module/icp/asm-x86_64/modes/aesni-gcm-x86_64.S

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/module/os/freebsd/spl/spl_policy.c

Loading...

sys/contrib/openzfs/module/os/linux/spl/spl-taskq.c

Loading...

sys/contrib/openzfs/module/os/linux/spl/spl-thread.c

Loading...

sys/contrib/openzfs/module/os/linux/zfs/policy.c

Loading...

sys/contrib/openzfs/module/os/linux/zfs/vdev_disk.c

Loading...

sys/contrib/openzfs/module/os/linux/zfs/vdev_file.c

Loading...

sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c

Loading...

sys/contrib/openzfs/module/os/linux/zfs/zpl_ctldir.c

Loading...

sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c

Loading...

sys/contrib/openzfs/module/os/linux/zfs/zpl_inode.c

Loading...

sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c

Loading...

sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c

Loading...

sys/contrib/openzfs/module/zcommon/zfs_valstr.c

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/rpm/redhat/zfs-kmod.spec.in

Loading...

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

Loading...

sys/contrib/openzfs/tests/zfs-tests/cmd/file/largest_file.c

Loading...

sys/contrib/openzfs/tests/zfs-tests/cmd/getversion.c

Loading...

sys/contrib/openzfs/tests/zfs-tests/include/blkdev.shlib

Loading...

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

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_003_pos.ksh

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_004_pos.ksh

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/io/io_uring.ksh

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_leak_keymaps.ksh

Loading...

sys/modules/zfs/zfs_config.h

Loading...

sys/modules/zfs/zfs_gitrev.h

Loading...