Please merge 2.2.7-2 into plucky

[Heitor Alves de Siqueira]

tracking bug

[ubuntu290wit (ubuntu290wit)]

Would you please also take care of https://bugs.launchpad.net/ubuntu/+source/zfs-linux/+bug/2094795 ?

[Heitor Alves de Siqueira (halves)]

This has been uploaded, but migration from plucky-proposed isn't moving forward because of a few things I missed in my merge. I believe all migration issues will be addressed by the attached follow-up:

- autopkgtests for s390x are failing due to a known bug with draid pools on that arch. This has been reported upstream, and previous versions have marked this test as an expected FAIL. I've carried that patch into the current version, and opened bug 2097378 to track it. Considering this is also affecting the previous version of zfs-linux, I don't think we should gate the new upstream release due to this bug

- packages depending on zfs-dkms in universe seems to be a side-effect of how our zfs kernel modules are built. there's also a previous patch that remove zfs-dkms deps for some packages, so they can be installed in containers (where the host kernel would have the ZFS module loaded). I've also carried this into the new version, and as a bonus it should fix the migration issue being reported

[Simon Quigley (tsimonq2)]

Sure, let's give this a try!

I'm curious if $arch will work, but let's see.

[Heitor Alves de Siqueira (halves)]

Ok, third time's the charm. "$arch" didn't work, as I didn't set it from outside the script like in previous versions. Regardless, it seems the autopkgtest runners for this latest version are not letting the later draid tests execute at all if the first one breaks, so we never get to that if condition regardless.

I believe the correct way to proceed for now is to simply skip the draid tests entirely for s390x. This is a difficult architecture to come by for us to investigate, and it shouldn't hold off the entire merge for one bug that already affected previous versions. I'm tracking it in bug 2097378, and will investigate it properly as soon as I have access to a physical s390x server. Meanwhile, this new debdiff should clear out the proposed migration (validated autopkgtests against a PPA, green results at [0]).

[0] https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-halves-zfs-merge-2095529/plucky/s390x/z/zfs-linux/20250213_134404_d673c@/log.gz

[Benjamin Drung (bdrung)]

Sponsored this change as zfs-linux 2.2.7-2ubuntu4 (since there was an upload in between).

[Launchpad Janitor (janitor)]

This bug was fixed in the package zfs-linux - 2.2.7-2ubuntu4

---------------
zfs-linux (2.2.7-2ubuntu4) plucky; urgency=medium

  * debian/tests/kernel-smoke-test-pool-draid: skip unsupported draid tests on
    s390x

zfs-linux (2.2.7-2ubuntu3) plucky; urgency=medium

  * Linux 6.14 support:
    - 5000-Linux-6.14-dops-d_revalidate-now-takes-four-args.patch
    - 5001-Linux-6.14-BLK_MQ_F_SHOULD_MERGE-was-removed.patch

zfs-linux (2.2.7-2ubuntu2) plucky; urgency=medium

  * debian/control: drop dependencies on "zfs-modules | zfs-dkms". This allows
    packages to be installed in containers, on hosts that have ZFS modules
    loaded
  * debian/tests/kernel-smoke-test-pool-draid: mark broken test on s390x
    architectures

zfs-linux (2.2.7-2ubuntu1) plucky; urgency=medium

  * New upstream release 2.2.7
  * Merge with Debian unstable (LP: #2095529):
    - Drop Changes:
       - 0001-Linux-6.12-compat-avoid-kmem_cache_create-redefinition.patch
       - 0002-Linux-6.12-compat-support-3arg-dequeue_signal-without-task-param.patch
       - 0003-Linux-6.12-compat-FMODE_UNSIGNED_OFFSET-is-now-FOP_UNSIGNED_OFFSET.patch
       - 0004-Linux-6.12-compat-f_version-removed-from-struct-file.patch
       - 0005-Linux-6.12-compat-PG_error-flag-was-removed.patch
       [6.12 compat was introduced in upstream 2.2.7]
    - Rebase Ubuntu patchset to integrate with zsys:
       - d/p/ubuntu/0001-Revert-etc-systemd-zfs-mount-generator-rewrite-in-C.patch
       - d/p/ubuntu/4000-zsys-support.patch
    - debian/tests/control:
      - smoketest only, as Ubuntu kernel testing covers ZFS testsuite
      - Drop depends on linux-headers-*

zfs-linux (2.2.7-2) unstable; urgency=medium

  * Add patch to fix simd_stat compilation on armel

zfs-linux (2.2.7-1) unstable; urgency=medium

  [ Aron Xu ]
  * d/control: Breaks zfs-fuse (Closes: #1058684)

  [ Shengqi Chen ]
  * New upstream version 2.2.7 (Closes: #1089578, #1089488, #1084964)
  * Refresh existing patches & symbol control files
  * d/rules: skip installing upstream removed files
  * d/copyright: remove superfluous files
  * d/control: add zfs-fuse version to Breaks

zfs-linux (2.2.6-2) unstable; urgency=high

  [ Alexandre Detiste ]
  * d/control: remove python3-distutils from Depends: alternative (Closes: #1082141)

  [ Aron Xu ]
  * Revert "d/patches: add bump-linux-maximum.patch"

 -- Heitor Alves de Siqueira <email address hidden> Thu, 13 Feb 2025 15:46:44 +0100