diff --git a/filesystems/openzfs/files/patch-module_zfs_vdev.c b/filesystems/openzfs/files/patch-module_zfs_vdev.c
new file mode 100644
index 000000000000..eeadafa57d2d
--- /dev/null
+++ b/filesystems/openzfs/files/patch-module_zfs_vdev.c
@@ -0,0 +1,11 @@
+--- module/zfs/vdev.c.orig	2025-12-18 18:01:01 UTC
++++ module/zfs/vdev.c
+@@ -4674,7 +4674,7 @@ vdev_clear(spa_t *spa, vdev_t *vd)
+ 	vd->vdev_stat.vs_checksum_errors = 0;
+ 	vd->vdev_stat.vs_dio_verify_errors = 0;
+ 	vd->vdev_stat.vs_slow_ios = 0;
+-	atomic_store_64(&vd->vdev_outlier_count, 0);
++	atomic_store_64((volatile uint64_t *)&vd->vdev_outlier_count, 0);
+ 	vd->vdev_read_sit_out_expire = 0;
+ 
+ 	for (int c = 0; c < vd->vdev_children; c++)
diff --git a/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_mmap__seek.c b/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_mmap__seek.c
new file mode 100644
index 000000000000..cbb98fffb027
--- /dev/null
+++ b/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_mmap__seek.c
@@ -0,0 +1,11 @@
+--- tests/zfs-tests/cmd/mmap_seek.c.orig	2025-12-30 21:33:04 UTC
++++ tests/zfs-tests/cmd/mmap_seek.c
+@@ -55,7 +55,7 @@ seek_expect(int fd, off_t offset, int whence, off_t ex
+ 		return;
+ 
+ 	int err = errno;
+-	fprintf(stderr, "lseek(fd, %ld, SEEK_%s) = %ld (expected %ld)",
++	fprintf(stderr, "lseek(fd, %jd, SEEK_%s) = %jd (expected %jd)",
+ 	    offset, (whence == SEEK_DATA ? "DATA" : "HOLE"),
+ 	    seek_offset, expect_offset);
+ 	if (err != 0)