Dimitri John Ledkov

Merge ~xnox/+git/kernel-versions:fix-zfs-v6.2.8+ into ~canonical-kernel/+git/kernel-versions:master

  1. Git
  2. lp:~xnox/+git/kernel-versions
  3. fix-zfs-v6.2.8+
  4. Merge into master
Proposed by Dimitri John Ledkov
Status: Merged
Merge reported by: Dimitri John Ledkov
Merged at revision: 8156f6b8a2bc0276eb42ca2699974d283ac297a7
Proposed branch: ~xnox/+git/kernel-versions:fix-zfs-v6.2.8+
Merge into: ~canonical-kernel/+git/kernel-versions:master
Diff against target: 14 lines (+2/-2)
2 files modified
dkms-versions/lunar:main (+1/-1)
dkms-versions/mantic:main (+1/-1)
Reviewer Review Type Date Requested Status
Roxana Nicolescu (community) Approve
Stefan Bader Approve
Review via email: mp+442998@code.launchpad.net

Commit message

Update zfs-linux from proposed, due to FTBFS

BugLink: https://bugs.launchpad.net/bugs/2019450

Needed for the current cycle, so needs to be pulled into current cycle branch & then update-dkms-versions in v6.2 top-level kernel(s).

To post a comment you must log in.
Revision history for this message
Stefan Bader (smb) wrote :

Versions appear right to me.

review: Approve
Revision history for this message
Roxana Nicolescu (roxanan) wrote :

LGTM. Thanks for fixing this!

review: Approve
Revision history for this message
Roxana Nicolescu (roxanan) wrote :

For some reason I cannot change the status to merged.
I pushed this to master and 2023.05.15 branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/dkms-versions/lunar:main b/dkms-versions/lunar:main
2index 5fc00b1..3ae690c 100644
3--- a/dkms-versions/lunar:main
4+++ b/dkms-versions/lunar:main
5@@ -1 +1 @@
6-zfs-linux 2.1.9-2ubuntu1 modulename=zfs debpath=pool/universe/z/%package%/zfs-dkms_%version%_all.deb arch=amd64 arch=arm64 arch=ppc64el arch=s390x rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms
7+zfs-linux 2.1.9-2ubuntu1.1 modulename=zfs debpath=pool/universe/z/%package%/zfs-dkms_%version%_all.deb arch=amd64 arch=arm64 arch=ppc64el arch=s390x rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms
8diff --git a/dkms-versions/mantic:main b/dkms-versions/mantic:main
9index 5fc00b1..b24382a 100644
10--- a/dkms-versions/mantic:main
11+++ b/dkms-versions/mantic:main
12@@ -1 +1 @@
13-zfs-linux 2.1.9-2ubuntu1 modulename=zfs debpath=pool/universe/z/%package%/zfs-dkms_%version%_all.deb arch=amd64 arch=arm64 arch=ppc64el arch=s390x rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms
14+zfs-linux 2.1.9-2ubuntu2 modulename=zfs debpath=pool/universe/z/%package%/zfs-dkms_%version%_all.deb arch=amd64 arch=arm64 arch=ppc64el arch=s390x rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms

Subscribers

People subscribed via source and target branches