diff -pruN 1.47.2-3/debian/.gitignore 1.47.2-3ubuntu2/debian/.gitignore
--- 1.47.2-3/debian/.gitignore	2025-06-10 18:59:29.000000000 +0000
+++ 1.47.2-3ubuntu2/debian/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-!patches
diff -pruN 1.47.2-3/debian/changelog 1.47.2-3ubuntu2/debian/changelog
--- 1.47.2-3/debian/changelog	2025-06-10 18:59:29.000000000 +0000
+++ 1.47.2-3ubuntu2/debian/changelog	2025-09-03 17:46:20.000000000 +0000
@@ -1,3 +1,17 @@
+e2fsprogs (1.47.2-3ubuntu2) questing; urgency=medium
+
+  * Rebuild to include updated RISC-V base ISA RVA23
+
+ -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com>  Wed, 03 Sep 2025 17:46:20 +0000
+
+e2fsprogs (1.47.2-3ubuntu1) questing; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 12 Jun 2025 15:13:43 +0200
+
 e2fsprogs (1.47.2-3) unstable; urgency=medium
 
   * Fix a typo in fuse2fs.postrm which breaks /usr-move mitigation
@@ -47,6 +61,14 @@ e2fsprogs (1.47.2-2) unstable; urgency=m
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Mon, 09 Jun 2025 20:49:10 -0400
 
+e2fsprogs (1.47.2-1ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 07 Jan 2025 21:26:01 +0100
+
 e2fsprogs (1.47.2-1) unstable; urgency=medium
 
   * New upstream version
@@ -107,6 +129,14 @@ e2fsprogs (1.47.2~rc1-1) unstable; urgen
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Thu, 28 Nov 2024 23:35:35 -0500
 
+e2fsprogs (1.47.1-1ubuntu1) oracular; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 25 Jun 2024 11:33:08 +0200
+
 e2fsprogs (1.47.1-1) unstable; urgency=medium
 
   * New upstream version
@@ -235,6 +265,33 @@ e2fsprogs (1.47.0-2.4) unstable; urgency
 
  -- Helmut Grohne <helmut@subdivi.de>  Wed, 13 Mar 2024 07:20:06 +0100
 
+e2fsprogs (1.47.0-2.4~exp1ubuntu4) noble; urgency=high
+
+  * No change rebuild against libfuse2t64.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Mon, 08 Apr 2024 16:38:40 +0200
+
+e2fsprogs (1.47.0-2.4~exp1ubuntu3) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 31 Mar 2024 07:33:00 +0000
+
+e2fsprogs (1.47.0-2.4~exp1ubuntu2) noble; urgency=medium
+
+  * Make the provides for the renamed packages versioned.
+  * Break against the first version not building the t64 packages anymore.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 12 Mar 2024 21:22:45 +0100
+
+e2fsprogs (1.47.0-2.4~exp1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Tue, 12 Mar 2024 11:31:16 -0600
+
 e2fsprogs (1.47.0-2.4~exp1) experimental; urgency=medium
 
   * Non-maintainer upload.
@@ -244,6 +301,14 @@ e2fsprogs (1.47.0-2.4~exp1) experimental
 
  -- Helmut Grohne <helmut@subdivi.de>  Sun, 10 Mar 2024 21:02:48 +0100
 
+e2fsprogs (1.47.0-2.3ubuntu1) noble; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 04 Mar 2024 08:18:05 +0100
+
 e2fsprogs (1.47.0-2.3) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -266,6 +331,14 @@ e2fsprogs (1.47.0-2.2) unstable; urgency
 
  -- Michael Hudson-Doyle <mwhudson@debian.org>  Wed, 28 Feb 2024 23:40:42 +0000
 
+e2fsprogs (1.47.0-2ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian Unstable. Remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 26 Jul 2023 13:26:17 -0500
+
 e2fsprogs (1.47.0-2) unstable; urgency=medium
 
   * Don't enable metadata_csum_seed and orhpan_file by default (Closes:
@@ -273,6 +346,25 @@ e2fsprogs (1.47.0-2) unstable; urgency=m
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Sat, 04 Mar 2023 22:16:08 -0500
 
+e2fsprogs (1.47.0-1ubuntu2) mantic; urgency=medium
+
+  * Temporarily disable orphan_file by default, such that fsck from jammy
+    can check ext4 created in mantic. Given the new incompat ext4 features
+    that v5.15 & hwe kernels support, ideally e2fsprogs 1.47.0 should be
+    SRUed into jammy. LP: #2025339
+
+ -- Dimitri John Ledkov <dimitri.ledkov@canonical.com>  Thu, 29 Jun 2023 10:14:32 +0100
+
+e2fsprogs (1.47.0-1ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+  * Disable the metadata_csum_seed feature again, as grub does not yet
+    support it (Closes: #866603)
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Fri, 17 Feb 2023 11:58:55 +0100
+
 e2fsprogs (1.47.0-1) unstable; urgency=medium
 
   * New upstream version
@@ -333,6 +425,17 @@ e2fsprogs (1.46.6~rc1-1.1) unstable; urg
 
  -- Bastian Germann <bage@debian.org>  Tue, 03 Jan 2023 14:31:18 +0100
 
+e2fsprogs (1.46.6~rc1-1ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+  * Dropped changes (applied in Debian):
+    - 0001-tests-support-older-versions-of-timeout-in-r_corrupt
+    - CVE-2022-1304.patch
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Tue, 22 Nov 2022 15:15:27 +0100
+
 e2fsprogs (1.46.6~rc1-1) unstable; urgency=medium
 
   * Trial upstream release for 1.46.6
@@ -363,6 +466,25 @@ e2fsprogs (1.46.6~rc1-1) unstable; urgen
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Mon, 12 Sep 2022 08:27:55 -0400
 
+e2fsprogs (1.46.5-2ubuntu2) kinetic; urgency=medium
+
+  * SECURITY UPDATE: Out-of-bounds read/write vulnerability
+    Issue leads to segmentation fault and possibly arbitrary code
+    execution via a specially crafted filesystem.
+    - debian/patches/CVE-2022-1304.patch: checks that all leaf nodes of
+      file system contain at least one extent.
+    - CVE-2022-1304
+
+ -- Mark Esler <mark.esler@canonical.com>  Thu, 02 Jun 2022 22:03:15 -0500
+
+e2fsprogs (1.46.5-2ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 08 Jan 2022 21:02:36 +0100
+
 e2fsprogs (1.46.5-2) unstable; urgency=medium
 
   * Fix build on GNU/kFreeBSD (caused by the fact that the Debian port has
@@ -371,6 +493,14 @@ e2fsprogs (1.46.5-2) unstable; urgency=m
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Mon, 03 Jan 2022 23:48:13 -0500
 
+e2fsprogs (1.46.5-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 01 Jan 2022 22:41:06 +0100
+
 e2fsprogs (1.46.5-1) unstable; urgency=medium
 
   * New upstream release
@@ -397,6 +527,14 @@ e2fsprogs (1.46.5-1) unstable; urgency=m
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Thu, 30 Dec 2021 00:35:14 -0500
 
+e2fsprogs (1.46.4-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 03 Nov 2021 09:32:13 +0100
+
 e2fsprogs (1.46.4-1) unstable; urgency=medium
 
   * New upstream release
@@ -425,6 +563,32 @@ e2fsprogs (1.46.4-1) unstable; urgency=m
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Wed, 18 Aug 2021 22:47:40 -0400
 
+e2fsprogs (1.46.3-1ubuntu3) impish; urgency=medium
+
+  * Restore mke2fs capability to create files adding patch
+
+    - mke2fs: fix creating a file system image w/o a pre-existing file
+
+ -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com>  Mon, 30 Aug 2021 17:58:29 +0200
+
+e2fsprogs (1.46.3-1ubuntu2) impish; urgency=medium
+
+  * Fix failing tests on bigendian system (LP: #1939409)
+    using upstream patches queued for 1.46.4:
+
+    - e2fsck: fix f_baddotdir failure on big-endian systems
+    - libext2fs: fix translation of Posix ACL's on big-endian systems
+
+ -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com>  Wed, 11 Aug 2021 19:04:33 +0200
+
+e2fsprogs (1.46.3-1ubuntu1) impish; urgency=medium
+
+  * Merge from Debian experimental. Remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+
+ -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com>  Tue, 10 Aug 2021 10:07:26 +0200
+
 e2fsprogs (1.46.3-1) experimental; urgency=medium
 
   * New upstream release
@@ -483,6 +647,20 @@ e2fsprogs (1.46.2-2) unstable; urgency=m
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Mon, 07 Jun 2021 07:27:15 -0400
 
+e2fsprogs (1.46.2-1ubuntu2) impish; urgency=medium
+
+  * Apply upstream fix for unaligned memory access.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 27 May 2021 13:20:34 +0200
+
+e2fsprogs (1.46.2-1ubuntu1) impish; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 10 May 2021 14:31:18 +0200
+
 e2fsprogs (1.46.2-1) unstable; urgency=medium
 
   * New upstream release
@@ -573,6 +751,20 @@ e2fsprogs (1.46.0-1) experimental; urgen
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Fri, 29 Jan 2021 16:24:41 -0500
 
+e2fsprogs (1.45.7-1ubuntu2) hirsute; urgency=medium
+
+  * No-change rebuild to drop the udeb package.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 22 Feb 2021 10:30:51 +0100
+
+e2fsprogs (1.45.7-1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 29 Jan 2021 12:37:12 -0800
+
 e2fsprogs (1.45.7-1) unstable; urgency=medium
 
   * New upstream release
@@ -618,6 +810,14 @@ e2fsprogs (1.45.7-1) unstable; urgency=m
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Fri, 29 Jan 2021 00:19:52 -0500
 
+e2fsprogs (1.45.6-1ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 01 May 2020 14:47:58 -0700
+
 e2fsprogs (1.45.6-1) unstable; urgency=medium
 
   * New upstream release
@@ -642,6 +842,21 @@ e2fsprogs (1.45.6-1) unstable; urgency=m
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Fri, 20 Mar 2020 23:49:33 -0400
 
+e2fsprogs (1.45.5-2ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+  * Dropped changes, included upstream:
+    - debian/patches/CVE-2019-5188-*.patch:  abort if there is a corrupted
+      directory block when rehashing and don't try to rehash a deleted directory
+      in e2fsck/rehash.c, e2fsck/pass1b.c.
+    - debian/patches/CVE-2019-5094.patch: add checks to prevent
+      buffer overrun in quota code in lib/support/quotaio_tree.c,
+      lib/support/quotaio_v2.c, lib/support/mkquota.c.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 13 Feb 2020 22:08:18 -0800
+
 e2fsprogs (1.45.5-2) unstable; urgency=medium
 
   * Fix com_err support on Hurd, which has POSIX E* error code starting at
@@ -714,6 +929,34 @@ e2fsprogs (1.45.4-1) unstable; urgency=m
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Mon, 23 Sep 2019 15:31:27 -0400
 
+e2fsprogs (1.45.3-4ubuntu3) focal; urgency=medium
+
+  * SECURITY UPDATE: Out-of-bounds write
+    - debian/patches/CVE-2019-5188-*.patch:  abort if there is a corrupted
+      directory block when rehashing and don't try to rehash a deleted directory
+      in e2fsck/rehash.c, e2fsck/pass1b.c.
+    - CVE-2019-5188
+
+ -- Leonidas S. Barbosa <leo.barbosa@canonical.com>  Wed, 22 Jan 2020 12:01:15 -0300
+
+e2fsprogs (1.45.3-4ubuntu2) eoan; urgency=medium
+
+  * SECURITY UPDATE: Out-of-bounds write on the heap
+    - debian/patches/CVE-2019-5094.patch: add checks to prevent
+      buffer overrun in quota code in lib/support/quotaio_tree.c,
+      lib/support/quotaio_v2.c, lib/support/mkquota.c.
+    - CVE-2019-5094
+
+ -- Leonidas S. Barbosa <leo.barbosa@canonical.com>  Mon, 30 Sep 2019 14:57:59 -0300
+
+e2fsprogs (1.45.3-4ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian testing, remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf stanzas, so lvm migration
+      between non-4k PVs and 4k PVs works regardless of the volume size.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Sun, 08 Sep 2019 04:12:08 -0600
+
 e2fsprogs (1.45.3-4) unstable; urgency=medium
 
   * stop using Link Time Optimization; it breaks reproducible builds
@@ -774,6 +1017,15 @@ e2fsprogs (1.45.3-1) unstable; urgency=m
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Sun, 14 Jul 2019 21:01:11 -0400
 
+e2fsprogs (1.45.2-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Use 4k blocksize in all ext4 mke2fs.conf such that lvm migration
+      between non-4k PVs and 4k PVs works irrespective of the volume
+      size.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 24 Jun 2019 11:51:53 +0200
+
 e2fsprogs (1.45.2-1) unstable; urgency=medium
 
   * New upstream version
@@ -801,6 +1053,14 @@ e2fsprogs (1.45.1-2) unstable; urgency=m
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Mon, 20 May 2019 11:02:09 -0400
 
+e2fsprogs (1.45.1-1ubuntu1) eoan; urgency=medium
+
+  * Use 4k blocksize in all ext4 mke2fs.conf such that lvm migration
+    between non-4k PVs and 4k PVs works irrespective of the volume
+    size. LP: #1817097
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 15 May 2019 16:15:22 +0200
+
 e2fsprogs (1.45.1-1) unstable; urgency=medium
 
   * New upstream feature
diff -pruN 1.47.2-3/debian/patches/default-to-4k.patch 1.47.2-3ubuntu2/debian/patches/default-to-4k.patch
--- 1.47.2-3/debian/patches/default-to-4k.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1.47.2-3ubuntu2/debian/patches/default-to-4k.patch	2024-06-25 09:33:03.000000000 +0000
@@ -0,0 +1,22 @@
+Description: Use 4k blocksize in all ext4 mke2fs.conf such that lvm migration
+  between non-4k PVs and 4k PVs works irrespective of the volume size.
+Author: Dimitri John Ledkov <xnox@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1817097
+
+
+Index: e2fsprogs-1.47.1-1ubuntu1/misc/mke2fs.conf.in
+===================================================================
+--- e2fsprogs-1.47.1-1ubuntu1.orig/misc/mke2fs.conf.in
++++ e2fsprogs-1.47.1-1ubuntu1/misc/mke2fs.conf.in
+@@ -14,11 +14,9 @@
+ 		features = has_journal,extent,huge_file,flex_bg,metadata_csum,metadata_csum_seed,64bit,dir_nlink,extra_isize,orphan_file
+ 	}
+ 	small = {
+-		blocksize = 1024
+ 		inode_ratio = 4096
+ 	}
+ 	floppy = {
+-		blocksize = 1024
+ 		inode_ratio = 8192
+ 	}
+ 	big = {
diff -pruN 1.47.2-3/debian/patches/series 1.47.2-3ubuntu2/debian/patches/series
--- 1.47.2-3/debian/patches/series	2025-06-10 18:59:29.000000000 +0000
+++ 1.47.2-3ubuntu2/debian/patches/series	2025-06-12 13:13:27.000000000 +0000
@@ -18,3 +18,4 @@
 0020-mke2fs-fix-a-misindentation-in-the-man-page.patch
 0021-libext2fs-fix-a-extent-tree-corruption-bug-in-ext2fs.patch
 0022-libext2fs-fix-integer-overflow-in-ext2fs_punch-when-.patch
+default-to-4k.patch
