diff -pruN 3.20250311.1/debian/changelog 3.20250311.1ubuntu1/debian/changelog
--- 3.20250311.1/debian/changelog	2025-03-24 00:13:20.000000000 +0000
+++ 3.20250311.1ubuntu1/debian/changelog	2025-05-22 17:11:30.000000000 +0000
@@ -1,3 +1,14 @@
+amd64-microcode (3.20250311.1ubuntu1) questing; urgency=medium
+
+  * Merge from Debian Unstable. Remaining changes:
+    - initramfs-tools hook (debian/initramfs.hook):
+      + Default to 'early' instead of 'auto' when building with
+        MODULES=most
+      + Do not override preset defaults from auto-exported conf
+        snippets loaded by initramfs-tools.
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Thu, 22 May 2025 13:11:30 -0400
+
 amd64-microcode (3.20250311.1) unstable; urgency=medium
 
   * Update package data from linux-firmware 20250311
@@ -37,6 +48,17 @@ amd64-microcode (3.20250311.1) unstable;
 
  -- Henrique de Moraes Holschuh <hmh@debian.org>  Sun, 23 Mar 2025 21:13:20 -0300
 
+amd64-microcode (3.20240820.1ubuntu1) plucky; urgency=medium
+
+  * Merge from Debian Unstable. Remaining changes:
+    - initramfs-tools hook (debian/initramfs.hook):
+      + Default to 'early' instead of 'auto' when building with
+        MODULES=most
+      + Do not override preset defaults from auto-exported conf
+        snippets loaded by initramfs-tools.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 21 Nov 2024 15:20:49 -0600
+
 amd64-microcode (3.20240820.1) unstable; urgency=high
 
   * Update package data from linux-firmware 20240820
@@ -97,6 +119,35 @@ amd64-microcode (3.20240710.1) unstable;
 
  -- Henrique de Moraes Holschuh <hmh@debian.org>  Sun, 11 Aug 2024 18:38:59 -0300
 
+amd64-microcode (3.20240116.2+nmu1ubuntu1.1) oracular-security; urgency=medium
+
+  * SECURITY UPDATE: arbitrary code execution via improper MSR access
+    - amd-ucode/microcode_amd_fam{17,19}h.bin{,.asc}: add updated AMD
+      fam17h and fam19h CPU microcodes
+    - Updated microcodes:
+      Family=0x17 Model=0x01 Stepping=0x02: Patch=0x0800126f Length=3200 bytes
+      Family=0x17 Model=0x31 Stepping=0x00: Patch=0x0830107c Length=3200 bytes
+      Family=0x19 Model=0x01 Stepping=0x00: Patch=0x0a00107a Length=5568 bytes
+      Family=0x19 Model=0x01 Stepping=0x01: Patch=0x0a0011d5 Length=5568 bytes
+      Family=0x19 Model=0x01 Stepping=0x02: Patch=0x0a001238 Length=5568 bytes
+      Family=0x19 Model=0x11 Stepping=0x01: Patch=0x0a101148 Length=5568 bytes
+      Family=0x19 Model=0x11 Stepping=0x02: Patch=0x0a101248 Length=5568 bytes
+      Family=0x19 Model=0xa0 Stepping=0x02: Patch=0x0aa00215 Length=5568 bytes
+    - CVE-2023-31315
+
+ -- Alex Murray <alex.murray@canonical.com>  Wed, 16 Oct 2024 15:38:44 +1030
+
+amd64-microcode (3.20240116.2+nmu1ubuntu1) oracular; urgency=medium
+
+  * Merge from Debian unstable; remaining changes:
+    - initramfs-tools hook (debian/initramfs.hook):
+      + Default to 'early' instead of 'auto' when building with
+        MODULES=most
+      + Do not override preset defaults from auto-exported conf
+        snippets loaded by initramfs-tools.
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Tue, 06 Aug 2024 13:34:56 +0200
+
 amd64-microcode (3.20240116.2+nmu1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -124,6 +175,23 @@ amd64-microcode (3.20240116.1) unstable;
 
  -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue, 06 Feb 2024 15:35:27 -0300
 
+amd64-microcode (3.20231019.1ubuntu2) noble; urgency=high
+
+  * No change rebuild for 64-bit time_t and frame pointers.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Mon, 08 Apr 2024 17:54:09 +0200
+
+amd64-microcode (3.20231019.1ubuntu1) noble; urgency=medium
+
+  * Merge from Debian unstable; remaining changes:
+    - initramfs-tools hook (debian/initramfs.hook):
+      + Default to 'early' instead of 'auto' when building with
+        MODULES=most
+      + Do not override preset defaults from auto-exported conf
+        snippets loaded by initramfs-tools.
+
+ -- Alex Murray <alex.murray@canonical.com>  Tue, 14 Nov 2023 14:36:10 +1030
+
 amd64-microcode (3.20231019.1) unstable; urgency=medium
 
   * Update package data from linux-firmware 20231019
@@ -146,6 +214,17 @@ amd64-microcode (3.20230823.1) unstable;
 
  -- Henrique de Moraes Holschuh <hmh@debian.org>  Fri, 13 Oct 2023 02:02:47 -0300
 
+amd64-microcode (3.20230808.1.1ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian unstable; remaining changes:
+    - initramfs-tools hook (debian/initramfs.hook):
+      + Default to 'early' instead of 'auto' when building with
+        MODULES=most
+      + Do not override preset defaults from auto-exported conf
+        snippets loaded by initramfs-tools.
+
+ -- Alex Murray <alex.murray@canonical.com>  Wed, 16 Aug 2023 13:08:48 +0930
+
 amd64-microcode (3.20230808.1.1) unstable; urgency=high
 
   * Update package data from linux-firmware 20230804-6-gf2eb058a
@@ -174,6 +253,17 @@ amd64-microcode (3.20230808.1.1) unstabl
 
  -- Henrique de Moraes Holschuh <hmh@debian.org>  Thu, 10 Aug 2023 10:18:38 -0300
 
+amd64-microcode (3.20230719.1ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian unstable; remaining changes:
+    - initramfs-tools hook (debian/initramfs.hook):
+      + Default to 'early' instead of 'auto' when building with
+        MODULES=most
+      + Do not override preset defaults from auto-exported conf
+        snippets loaded by initramfs-tools.
+
+ -- Alex Murray <alex.murray@canonical.com>  Tue, 25 Jul 2023 11:57:09 +0930
+
 amd64-microcode (3.20230719.1) unstable; urgency=high
 
   * Update package data from linux-firmware 20230625-39-g59fbffa9:
@@ -213,6 +303,32 @@ amd64-microcode (3.20220411.2) unstable;
 
  -- Cyril Brulebois <kibi@debian.org>  Fri, 17 Feb 2023 01:19:05 +0100
 
+amd64-microcode (3.20220411.1ubuntu3) kinetic; urgency=medium
+
+  * Bump the Breaks/Replaces on linux-firmware to match the version which
+    actually drops the conflicting files.  LP: #1983409.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 23 Aug 2022 15:23:32 +0000
+
+amd64-microcode (3.20220411.1ubuntu2) kinetic; urgency=medium
+
+  [ Mark Esler ]
+  * debian/control: add Breaks/Replaces on old linux-firmware for movement
+    of AMD-SEV files.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 19 Aug 2022 16:00:34 +0000
+
+amd64-microcode (3.20220411.1ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable, LP: #1983409. Remaining changes:
+    - initramfs-tools hook (debian/initramfs.hook):
+      + Default to 'early' instead of 'auto' when building with
+        MODULES=most
+      + Do not override preset defaults from auto-exported conf
+        snippets loaded by initramfs-tools.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 16 Aug 2022 16:32:16 -0700
+
 amd64-microcode (3.20220411.1) unstable; urgency=medium
 
   * Update package data from linux-firmware 20220411:
@@ -237,6 +353,23 @@ amd64-microcode (3.20220411.1) unstable;
 
  -- Henrique de Moraes Holschuh <hmh@debian.org>  Fri, 15 Apr 2022 18:27:36 -0300
 
+amd64-microcode (3.20191218.1ubuntu2) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 07 Oct 2021 12:09:20 +0200
+
+amd64-microcode (3.20191218.1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - initramfs-tools hook (debian/initramfs.hook):
+      + Default to 'early' instead of 'auto' when building with
+        MODULES=most
+      + Do not override preset defaults from auto-exported conf
+        snippets loaded by initramfs-tools.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 15 Feb 2020 23:43:50 -0800
+
 amd64-microcode (3.20191218.1) unstable; urgency=medium
 
   * New microcode update packages from AMD upstream:
@@ -246,6 +379,17 @@ amd64-microcode (3.20191218.1) unstable;
 
  -- Henrique de Moraes Holschuh <hmh@debian.org>  Fri, 20 Dec 2019 18:36:27 -0300
 
+amd64-microcode (3.20191021.1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable (LP: #1850752). Remaining changes:
+    - initramfs-tools hook (debian/initramfs.hook):
+      + Default to 'early' instead of 'auto' when building with
+        MODULES=most
+      + Do not override preset defaults from auto-exported conf
+        snippets loaded by initramfs-tools.
+
+ -- Steve Beattie <sbeattie@ubuntu.com>  Thu, 31 Oct 2019 09:41:22 -0700
+
 amd64-microcode (3.20191021.1) unstable; urgency=medium
 
   * New microcode update packages from AMD upstream:
@@ -258,6 +402,24 @@ amd64-microcode (3.20191021.1) unstable;
 
  -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue, 22 Oct 2019 21:00:17 -0300
 
+amd64-microcode (3.20181128.1ubuntu2) eoan; urgency=medium
+
+  * Do not override preset defaults from auto-exported conf snippets
+    loaded by initramfs-tools. This thus allows other hooks, or
+    alternative confdir override the built-in defaults at mkinitramfs
+    time. Specifically to support generating installer/golden/bare-metal
+    initrds with all microcodes for any hardware.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 31 Jul 2019 21:54:24 -0400
+
+amd64-microcode (3.20181128.1ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Default to 'early' instead of 'auto' in the initramfs-tools hook
+      when building with MODULES=most
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Mon, 07 Jan 2019 08:32:48 +0100
+
 amd64-microcode (3.20181128.1) unstable; urgency=medium
 
   * New microcode update packages from AMD upstream:
@@ -267,6 +429,13 @@ amd64-microcode (3.20181128.1) unstable;
 
  -- Henrique de Moraes Holschuh <hmh@debian.org>  Sat, 15 Dec 2018 18:42:12 -0200
 
+amd64-microcode (3.20180524.1ubuntu1) cosmic; urgency=medium
+
+  * Default to 'early' instead of 'auto' in the initramfs-tools hook
+    when building with MODULES=most (LP: #1778738)
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Tue, 26 Jun 2018 16:32:22 +0200
+
 amd64-microcode (3.20180524.1) unstable; urgency=high
 
   * New microcode update packages from AMD upstream:
@@ -554,3 +723,4 @@ amd64-microcode (0.20120117-1) unstable;
     to properly support AMD processors.  Closes: #676921.
 
  -- Henrique de Moraes Holschuh <hmh@debian.org>  Sun, 10 Jun 2012 12:22:01 -0300
+
diff -pruN 3.20250311.1/debian/control 3.20250311.1ubuntu1/debian/control
--- 3.20250311.1/debian/control	2025-03-23 21:42:35.000000000 +0000
+++ 3.20250311.1ubuntu1/debian/control	2025-05-22 17:11:30.000000000 +0000
@@ -1,7 +1,8 @@
 Source: amd64-microcode
 Section: non-free-firmware/admin
 Priority: standard
-Maintainer: Henrique de Moraes Holschuh <hmh@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Henrique de Moraes Holschuh <hmh@debian.org>
 Uploaders: Giacomo Catenazzi <cate@debian.org>
 Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.8
diff -pruN 3.20250311.1/debian/initramfs.hook 3.20250311.1ubuntu1/debian/initramfs.hook
--- 3.20250311.1/debian/initramfs.hook	2025-03-23 21:42:35.000000000 +0000
+++ 3.20250311.1ubuntu1/debian/initramfs.hook	2025-05-22 17:11:30.000000000 +0000
@@ -32,7 +32,11 @@ verbose()
 }
 
 AUCODE_FW_DIR=/usr/lib/firmware/amd-ucode
-AMD64UCODE_INITRAMFS=auto
+if [ "$MODULES" = "most" ]; then
+    AMD64UCODE_INITRAMFS=${AMD64UCODE_INITRAMFS:-early}
+else
+    AMD64UCODE_INITRAMFS=${AMD64UCODE_INITRAMFS:-auto}
+fi
 [ -r ${AMD64UCODE_CONFIG} ] && . ${AMD64UCODE_CONFIG}
 
 [ -z "${AMD64UCODE_INITRAMFS}" ] && AMD64UCODE_INITRAMFS=no
