From d13663b17cabdaa64f6dff761830fa81aacdb545 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 28 May 2026 15:45:43 -0700 Subject: [PATCH] CI: Lustre 6.16 kernel compatibility fix (#18602) Almalinux 9,10 kernels now include a backport of Linux commit v6.15-13744-g41cb08555c41 which renames the from_timer() function to timer_container_of(). Apply the upstream Lustre compatibility patch to our builds. This patch should be included in the next Lustre release and can be dropped then. ZFS-CI-Type: quick Signed-off-by: Brian Behlendorf Reviewed-by: Tony Hutter --- .github/workflows/scripts/qemu-6-lustre-tests-vm.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/scripts/qemu-6-lustre-tests-vm.sh b/.github/workflows/scripts/qemu-6-lustre-tests-vm.sh index ff3f0a356bb..62917f4cb72 100755 --- a/.github/workflows/scripts/qemu-6-lustre-tests-vm.sh +++ b/.github/workflows/scripts/qemu-6-lustre-tests-vm.sh @@ -25,8 +25,14 @@ cd lustre-release # Include Lustre patches to build against master/zfs-2.4.x. Once these # patches are merged we can remove these lines. +# +# LU-19539 osd-zfs: use osd_dmu_write() wrapper for xattrs +# LU-19761 osd-zfs: Build against ZFS 2.4.0 +# LU-19249 build: Compatibility updates for kernel v6.16 +# patches=('https://review.whamcloud.com/changes/fs%2Flustre-release~62101/revisions/2/patch?download' - 'https://review.whamcloud.com/changes/fs%2Flustre-release~63267/revisions/9/patch?download') + 'https://review.whamcloud.com/changes/fs%2Flustre-release~63267/revisions/9/patch?download' + 'https://review.whamcloud.com/changes/fs%2Flustre-release~60619/revisions/13/patch?download') for p in "${patches[@]}" ; do curl $p | base64 -d > patch