diff -Nru zfs-linux-2.1.2/debian/changelog zfs-linux-2.1.2/debian/changelog
--- zfs-linux-2.1.2/debian/changelog	2021-12-16 15:12:47.000000000 +0000
+++ zfs-linux-2.1.2/debian/changelog	2022-01-05 22:25:39.000000000 +0000
@@ -1,3 +1,11 @@
+zfs-linux (2.1.2-1ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian unstable (LP: #1954676). Additional Ubuntu changes:
+    - re-added spl package in debian/control
+    - misc debian/control adjustments
+
+ -- Andrea Righi <andrea.righi@canonical.com>  Wed, 05 Jan 2022 22:25:39 +0000
+
 zfs-linux (2.1.2-1) unstable; urgency=medium
 
   * New upstream version 2.1.2
diff -Nru zfs-linux-2.1.2/debian/control zfs-linux-2.1.2/debian/control
--- zfs-linux-2.1.2/debian/control	2021-11-26 19:09:10.000000000 +0000
+++ zfs-linux-2.1.2/debian/control	2022-01-05 22:25:39.000000000 +0000
@@ -1,7 +1,8 @@
 Source: zfs-linux
 Section: contrib/kernel
 Priority: optional
-Maintainer: Debian ZFS on Linux maintainers <pkg-zfsonlinux-devel@alioth-lists.debian.net>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian ZFS on Linux maintainers <pkg-zfsonlinux-devel@alioth-lists.debian.net>
 Uploaders: Aron Xu <aron@debian.org>,
            Carlos Alberto Lopez Perez <clopez@igalia.com>,
            Mo Zhou <lumin@debian.org>
@@ -194,7 +195,7 @@
  OpenZFS.
 
 Package: zfs-initramfs
-Architecture: all
+Architecture: amd64 arm64 ppc64el s390x riscv64
 Depends: busybox-initramfs | busybox-static | busybox,
          initramfs-tools,
          zfs-modules | zfs-dkms,
@@ -211,7 +212,7 @@
  for the initramfs-tools infrastructure.
 
 Package: zfs-dracut
-Architecture: all
+Architecture: amd64 arm64 ppc64el s390x riscv64
 Depends: dracut,
          zfs-modules | zfs-dkms,
          zfsutils-linux (>= ${source:Version}),
@@ -306,3 +307,41 @@
  This package provides the OpenZFS test infrastructure for destructively
  testing and validating a system using OpenZFS. It is entirely optional
  and should only be installed and used in test environments.
+
+Package: spl
+Section: contrib/metapackages
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: zfs-test
+Description: Solaris Porting Layer user-space utilities for Linux (dummy)
+ The Solaris Porting Layer (SPL) is a Linux kernel module which provides
+ many of the Solaris kernel APIs. This shim layer makes it possible to
+ run Solaris kernel code in the Linux kernel with relatively minimal
+ modification. The Solaris Porting LAyer Tests (SPLAT) is a Linux kernel
+ module which provides a testing harness for the SPL module.
+ .
+ SPL can be particularly useful when you want to track upstream Illumos
+ (or any other OpenSolaris fork) development closely and don't want the
+ overhead of maintaining a large patch which converts Solaris primitives
+ to Linux primitives.
+ .
+ This is a transitional dummy package. It can safely be removed.
+
+Package: spl-dkms
+Section: contrib/metapackages
+Architecture: all
+Depends: zfs-dkms, ${misc:Depends}
+Description: Solaris Porting Layer kernel modules for Linux (dummy)
+ The Solaris Porting Layer (SPL) is a Linux kernel module which provides
+ many of the Solaris kernel APIs. This shim layer makes it possible to
+ run Solaris kernel code in the Linux kernel with relatively minimal
+ modification. The Solaris Porting LAyer Tests (SPLAT) is a Linux kernel
+ module which provides a testing harness for the SPL module.
+ .
+ SPL can be particularly useful when you want to track upstream Illumos
+ (or any other OpenSolaris fork) development closely and don't want the
+ overhead of maintaining a large patch which converts Solaris primitives
+ to Linux primitives.
+ .
+ This is a transitional dummy package. It can safely be removed.
+ SPL dkms files had been merged into zfs-dkms as of ZFS 0.8.X series.