diff -Nru linux-restricted-modules-5.4.0/debian/ancillary/linux-restricted-generate/debian/changelog linux-restricted-modules-5.4.0/debian/ancillary/linux-restricted-generate/debian/changelog
--- linux-restricted-modules-5.4.0/debian/ancillary/linux-restricted-generate/debian/changelog	2024-03-22 16:10:28.000000000 +0000
+++ linux-restricted-modules-5.4.0/debian/ancillary/linux-restricted-generate/debian/changelog	2024-04-09 06:19:48.000000000 +0000
@@ -1,3 +1,10 @@
+linux-restricted-generate (5.4.0-176.196+1) focal; urgency=medium
+
+  * Packaging resync (LP: #1786013)
+    - debian/dkms-versions -- update from kernel-versions (adhoc/2024.03.04)
+
+ -- Andy Whitcroft <apw@canonical.com>  Tue, 09 Apr 2024 07:19:48 +0100
+
 linux-restricted-generate (5.4.0-176.196) focal; urgency=medium
 
   * Main version: 5.4.0-176.196
@@ -33,15 +40,3 @@
 
  -- Roxana Nicolescu <roxana.nicolescu@canonical.com>  Tue, 05 Mar 2024 17:01:08 +0100
 
-linux-restricted-generate (5.4.0-173.191) focal; urgency=medium
-
-  * Master version: 5.4.0-173.191
-
-  * Packaging resync (LP: #1786013)
-    - debian/dkms-versions -- update from kernel-versions (main/2024.02.05)
-
-  * Miscellaneous Ubuntu changes
-    - debian/tracking-bug -- update from master
-
- -- Stefan Bader <stefan.bader@canonical.com>  Fri, 02 Feb 2024 14:37:15 +0100
-
diff -Nru linux-restricted-modules-5.4.0/debian/ancillary/linux-restricted-generate/debian/dkms-versions linux-restricted-modules-5.4.0/debian/ancillary/linux-restricted-generate/debian/dkms-versions
--- linux-restricted-modules-5.4.0/debian/ancillary/linux-restricted-generate/debian/dkms-versions	2024-03-22 16:10:28.000000000 +0000
+++ linux-restricted-modules-5.4.0/debian/ancillary/linux-restricted-generate/debian/dkms-versions	2024-04-09 06:19:48.000000000 +0000
@@ -1,9 +1,9 @@
 nvidia-graphics-drivers-390 390.157-0ubuntu0.20.04.1 arch=amd64
 nvidia-graphics-drivers-470 470.239.06-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-465 transition=nvidia-graphics-drivers-460 transition=nvidia-graphics-drivers-455 transition=nvidia-graphics-drivers-450 transition=nvidia-graphics-drivers-440 transition=nvidia-graphics-drivers-435
-nvidia-graphics-drivers-535 535.161.07-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-530 transition=nvidia-graphics-drivers-525 transition=nvidia-graphics-drivers-520 transition=nvidia-graphics-drivers-515 transition=nvidia-graphics-drivers-510 transition=nvidia-graphics-drivers-495
-nvidia-graphics-drivers-535 535.161.07-0ubuntu0.20.04.1 arch=amd64 variant=open transition=nvidia-graphics-drivers-530-open transition=nvidia-graphics-drivers-525-open
+nvidia-graphics-drivers-535 535.171.04-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-530 transition=nvidia-graphics-drivers-525 transition=nvidia-graphics-drivers-520 transition=nvidia-graphics-drivers-515 transition=nvidia-graphics-drivers-510 transition=nvidia-graphics-drivers-495
+nvidia-graphics-drivers-535 535.171.04-0ubuntu0.20.04.1 arch=amd64 variant=open transition=nvidia-graphics-drivers-530-open transition=nvidia-graphics-drivers-525-open
 nvidia-graphics-drivers-418-server 418.226.00-0ubuntu0.20.04.2 arch=amd64
 nvidia-graphics-drivers-450-server 450.248.02-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-440-server
 nvidia-graphics-drivers-470-server 470.239.06-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-460-server
-nvidia-graphics-drivers-535-server 535.161.07-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-525-server transition=nvidia-graphics-drivers-515-server transition=nvidia-graphics-drivers-510-server
-nvidia-graphics-drivers-535-server 535.161.07-0ubuntu0.20.04.1 arch=amd64 variant=open
+nvidia-graphics-drivers-535-server 535.161.08-0ubuntu2.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-525-server transition=nvidia-graphics-drivers-515-server transition=nvidia-graphics-drivers-510-server
+nvidia-graphics-drivers-535-server 535.161.08-0ubuntu2.20.04.1 arch=amd64 variant=open
diff -Nru linux-restricted-modules-5.4.0/debian/ancillary/linux-restricted-signatures/debian/changelog linux-restricted-modules-5.4.0/debian/ancillary/linux-restricted-signatures/debian/changelog
--- linux-restricted-modules-5.4.0/debian/ancillary/linux-restricted-signatures/debian/changelog	2024-03-22 16:10:28.000000000 +0000
+++ linux-restricted-modules-5.4.0/debian/ancillary/linux-restricted-signatures/debian/changelog	2024-04-09 06:19:48.000000000 +0000
@@ -1,3 +1,10 @@
+linux-restricted-signatures (5.4.0-176.196+1) focal; urgency=medium
+
+  * Packaging resync (LP: #1786013)
+    - debian/dkms-versions -- update from kernel-versions (adhoc/2024.03.04)
+
+ -- Andy Whitcroft <apw@canonical.com>  Tue, 09 Apr 2024 07:19:48 +0100
+
 linux-restricted-signatures (5.4.0-176.196) focal; urgency=medium
 
   * Main version: 5.4.0-176.196
@@ -33,15 +40,3 @@
 
  -- Roxana Nicolescu <roxana.nicolescu@canonical.com>  Tue, 05 Mar 2024 17:01:08 +0100
 
-linux-restricted-signatures (5.4.0-173.191) focal; urgency=medium
-
-  * Master version: 5.4.0-173.191
-
-  * Packaging resync (LP: #1786013)
-    - debian/dkms-versions -- update from kernel-versions (main/2024.02.05)
-
-  * Miscellaneous Ubuntu changes
-    - debian/tracking-bug -- update from master
-
- -- Stefan Bader <stefan.bader@canonical.com>  Fri, 02 Feb 2024 14:37:15 +0100
-
diff -Nru linux-restricted-modules-5.4.0/debian/ancillary/linux-restricted-signatures/debian/dkms-versions linux-restricted-modules-5.4.0/debian/ancillary/linux-restricted-signatures/debian/dkms-versions
--- linux-restricted-modules-5.4.0/debian/ancillary/linux-restricted-signatures/debian/dkms-versions	2024-03-22 16:10:28.000000000 +0000
+++ linux-restricted-modules-5.4.0/debian/ancillary/linux-restricted-signatures/debian/dkms-versions	2024-04-09 06:19:48.000000000 +0000
@@ -1,9 +1,9 @@
 nvidia-graphics-drivers-390 390.157-0ubuntu0.20.04.1 arch=amd64
 nvidia-graphics-drivers-470 470.239.06-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-465 transition=nvidia-graphics-drivers-460 transition=nvidia-graphics-drivers-455 transition=nvidia-graphics-drivers-450 transition=nvidia-graphics-drivers-440 transition=nvidia-graphics-drivers-435
-nvidia-graphics-drivers-535 535.161.07-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-530 transition=nvidia-graphics-drivers-525 transition=nvidia-graphics-drivers-520 transition=nvidia-graphics-drivers-515 transition=nvidia-graphics-drivers-510 transition=nvidia-graphics-drivers-495
-nvidia-graphics-drivers-535 535.161.07-0ubuntu0.20.04.1 arch=amd64 variant=open transition=nvidia-graphics-drivers-530-open transition=nvidia-graphics-drivers-525-open
+nvidia-graphics-drivers-535 535.171.04-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-530 transition=nvidia-graphics-drivers-525 transition=nvidia-graphics-drivers-520 transition=nvidia-graphics-drivers-515 transition=nvidia-graphics-drivers-510 transition=nvidia-graphics-drivers-495
+nvidia-graphics-drivers-535 535.171.04-0ubuntu0.20.04.1 arch=amd64 variant=open transition=nvidia-graphics-drivers-530-open transition=nvidia-graphics-drivers-525-open
 nvidia-graphics-drivers-418-server 418.226.00-0ubuntu0.20.04.2 arch=amd64
 nvidia-graphics-drivers-450-server 450.248.02-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-440-server
 nvidia-graphics-drivers-470-server 470.239.06-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-460-server
-nvidia-graphics-drivers-535-server 535.161.07-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-525-server transition=nvidia-graphics-drivers-515-server transition=nvidia-graphics-drivers-510-server
-nvidia-graphics-drivers-535-server 535.161.07-0ubuntu0.20.04.1 arch=amd64 variant=open
+nvidia-graphics-drivers-535-server 535.161.08-0ubuntu2.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-525-server transition=nvidia-graphics-drivers-515-server transition=nvidia-graphics-drivers-510-server
+nvidia-graphics-drivers-535-server 535.161.08-0ubuntu2.20.04.1 arch=amd64 variant=open
diff -Nru linux-restricted-modules-5.4.0/debian/changelog linux-restricted-modules-5.4.0/debian/changelog
--- linux-restricted-modules-5.4.0/debian/changelog	2024-03-22 16:10:28.000000000 +0000
+++ linux-restricted-modules-5.4.0/debian/changelog	2024-04-09 06:19:48.000000000 +0000
@@ -1,3 +1,10 @@
+linux-restricted-modules (5.4.0-176.196+1) focal; urgency=medium
+
+  * Packaging resync (LP: #1786013)
+    - debian/dkms-versions -- update from kernel-versions (adhoc/2024.03.04)
+
+ -- Andy Whitcroft <apw@canonical.com>  Tue, 09 Apr 2024 07:19:48 +0100
+
 linux-restricted-modules (5.4.0-176.196) focal; urgency=medium
 
   * Main version: 5.4.0-176.196
diff -Nru linux-restricted-modules-5.4.0/debian/control linux-restricted-modules-5.4.0/debian/control
--- linux-restricted-modules-5.4.0/debian/control	2024-03-22 16:10:28.000000000 +0000
+++ linux-restricted-modules-5.4.0/debian/control	2024-04-09 06:19:48.000000000 +0000
@@ -20,8 +20,8 @@
  nvidia-graphics-drivers-450-server (= 450.248.02-0ubuntu0.20.04.1),
  nvidia-graphics-drivers-470 (= 470.239.06-0ubuntu0.20.04.1),
  nvidia-graphics-drivers-470-server (= 470.239.06-0ubuntu0.20.04.1),
- nvidia-graphics-drivers-535 (= 535.161.07-0ubuntu0.20.04.1),
- nvidia-graphics-drivers-535-server (= 535.161.07-0ubuntu0.20.04.1),
+ nvidia-graphics-drivers-535 (= 535.171.04-0ubuntu0.20.04.1),
+ nvidia-graphics-drivers-535-server (= 535.161.08-0ubuntu2.20.04.1),
 Standards-Version: 3.9.4
 Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-restricted-modules/+git/focal
 
@@ -563,7 +563,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-176-generic | linux-image-unsigned-5.4.0-176-generic,
- linux-signatures-nvidia-5.4.0-176-generic (= 5.4.0-176.196),
+ linux-signatures-nvidia-5.4.0-176-generic (= 5.4.0-176.196+1),
  linux-objects-nvidia-390-5.4.0-176-generic (= ${binary:Version}),
  ${nvk:nvidia-390},
 Description: Linux kernel nvidia modules for version 5.4.0-176
@@ -603,7 +603,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-176-generic | linux-image-unsigned-5.4.0-176-generic,
- linux-signatures-nvidia-5.4.0-176-generic (= 5.4.0-176.196),
+ linux-signatures-nvidia-5.4.0-176-generic (= 5.4.0-176.196+1),
  linux-objects-nvidia-470-5.4.0-176-generic (= ${binary:Version}),
  ${nvk:nvidia-470},
 Description: Linux kernel nvidia modules for version 5.4.0-176
@@ -643,7 +643,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-176-generic | linux-image-unsigned-5.4.0-176-generic,
- linux-signatures-nvidia-5.4.0-176-generic (= 5.4.0-176.196),
+ linux-signatures-nvidia-5.4.0-176-generic (= 5.4.0-176.196+1),
  linux-objects-nvidia-535-5.4.0-176-generic (= ${binary:Version}),
  ${nvk:nvidia-535},
 Description: Linux kernel nvidia modules for version 5.4.0-176
@@ -701,7 +701,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-176-generic | linux-image-unsigned-5.4.0-176-generic,
- linux-signatures-nvidia-5.4.0-176-generic (= 5.4.0-176.196),
+ linux-signatures-nvidia-5.4.0-176-generic (= 5.4.0-176.196+1),
  linux-objects-nvidia-418-server-5.4.0-176-generic (= ${binary:Version}),
  ${nvk:nvidia-418-server},
 Description: Linux kernel nvidia modules for version 5.4.0-176
@@ -741,7 +741,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-176-generic | linux-image-unsigned-5.4.0-176-generic,
- linux-signatures-nvidia-5.4.0-176-generic (= 5.4.0-176.196),
+ linux-signatures-nvidia-5.4.0-176-generic (= 5.4.0-176.196+1),
  linux-objects-nvidia-450-server-5.4.0-176-generic (= ${binary:Version}),
  ${nvk:nvidia-450-server},
 Description: Linux kernel nvidia modules for version 5.4.0-176
@@ -781,7 +781,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-176-generic | linux-image-unsigned-5.4.0-176-generic,
- linux-signatures-nvidia-5.4.0-176-generic (= 5.4.0-176.196),
+ linux-signatures-nvidia-5.4.0-176-generic (= 5.4.0-176.196+1),
  linux-objects-nvidia-470-server-5.4.0-176-generic (= ${binary:Version}),
  ${nvk:nvidia-470-server},
 Description: Linux kernel nvidia modules for version 5.4.0-176
@@ -821,7 +821,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-176-generic | linux-image-unsigned-5.4.0-176-generic,
- linux-signatures-nvidia-5.4.0-176-generic (= 5.4.0-176.196),
+ linux-signatures-nvidia-5.4.0-176-generic (= 5.4.0-176.196+1),
  linux-objects-nvidia-535-server-5.4.0-176-generic (= ${binary:Version}),
  ${nvk:nvidia-535-server},
 Description: Linux kernel nvidia modules for version 5.4.0-176
@@ -879,7 +879,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-176-lowlatency | linux-image-unsigned-5.4.0-176-lowlatency,
- linux-signatures-nvidia-5.4.0-176-lowlatency (= 5.4.0-176.196),
+ linux-signatures-nvidia-5.4.0-176-lowlatency (= 5.4.0-176.196+1),
  linux-objects-nvidia-390-5.4.0-176-lowlatency (= ${binary:Version}),
  ${nvk:nvidia-390},
 Description: Linux kernel nvidia modules for version 5.4.0-176
@@ -919,7 +919,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-176-lowlatency | linux-image-unsigned-5.4.0-176-lowlatency,
- linux-signatures-nvidia-5.4.0-176-lowlatency (= 5.4.0-176.196),
+ linux-signatures-nvidia-5.4.0-176-lowlatency (= 5.4.0-176.196+1),
  linux-objects-nvidia-470-5.4.0-176-lowlatency (= ${binary:Version}),
  ${nvk:nvidia-470},
 Description: Linux kernel nvidia modules for version 5.4.0-176
@@ -959,7 +959,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-176-lowlatency | linux-image-unsigned-5.4.0-176-lowlatency,
- linux-signatures-nvidia-5.4.0-176-lowlatency (= 5.4.0-176.196),
+ linux-signatures-nvidia-5.4.0-176-lowlatency (= 5.4.0-176.196+1),
  linux-objects-nvidia-535-5.4.0-176-lowlatency (= ${binary:Version}),
  ${nvk:nvidia-535},
 Description: Linux kernel nvidia modules for version 5.4.0-176
@@ -1017,7 +1017,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-176-lowlatency | linux-image-unsigned-5.4.0-176-lowlatency,
- linux-signatures-nvidia-5.4.0-176-lowlatency (= 5.4.0-176.196),
+ linux-signatures-nvidia-5.4.0-176-lowlatency (= 5.4.0-176.196+1),
  linux-objects-nvidia-418-server-5.4.0-176-lowlatency (= ${binary:Version}),
  ${nvk:nvidia-418-server},
 Description: Linux kernel nvidia modules for version 5.4.0-176
@@ -1057,7 +1057,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-176-lowlatency | linux-image-unsigned-5.4.0-176-lowlatency,
- linux-signatures-nvidia-5.4.0-176-lowlatency (= 5.4.0-176.196),
+ linux-signatures-nvidia-5.4.0-176-lowlatency (= 5.4.0-176.196+1),
  linux-objects-nvidia-450-server-5.4.0-176-lowlatency (= ${binary:Version}),
  ${nvk:nvidia-450-server},
 Description: Linux kernel nvidia modules for version 5.4.0-176
@@ -1097,7 +1097,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-176-lowlatency | linux-image-unsigned-5.4.0-176-lowlatency,
- linux-signatures-nvidia-5.4.0-176-lowlatency (= 5.4.0-176.196),
+ linux-signatures-nvidia-5.4.0-176-lowlatency (= 5.4.0-176.196+1),
  linux-objects-nvidia-470-server-5.4.0-176-lowlatency (= ${binary:Version}),
  ${nvk:nvidia-470-server},
 Description: Linux kernel nvidia modules for version 5.4.0-176
@@ -1137,7 +1137,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  linux-image-5.4.0-176-lowlatency | linux-image-unsigned-5.4.0-176-lowlatency,
- linux-signatures-nvidia-5.4.0-176-lowlatency (= 5.4.0-176.196),
+ linux-signatures-nvidia-5.4.0-176-lowlatency (= 5.4.0-176.196+1),
  linux-objects-nvidia-535-server-5.4.0-176-lowlatency (= ${binary:Version}),
  ${nvk:nvidia-535-server},
 Description: Linux kernel nvidia modules for version 5.4.0-176
diff -Nru linux-restricted-modules-5.4.0/debian/dkms-versions linux-restricted-modules-5.4.0/debian/dkms-versions
--- linux-restricted-modules-5.4.0/debian/dkms-versions	2024-03-22 16:10:28.000000000 +0000
+++ linux-restricted-modules-5.4.0/debian/dkms-versions	2024-04-09 06:19:47.000000000 +0000
@@ -1,9 +1,9 @@
 nvidia-graphics-drivers-390 390.157-0ubuntu0.20.04.1 arch=amd64
 nvidia-graphics-drivers-470 470.239.06-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-465 transition=nvidia-graphics-drivers-460 transition=nvidia-graphics-drivers-455 transition=nvidia-graphics-drivers-450 transition=nvidia-graphics-drivers-440 transition=nvidia-graphics-drivers-435
-nvidia-graphics-drivers-535 535.161.07-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-530 transition=nvidia-graphics-drivers-525 transition=nvidia-graphics-drivers-520 transition=nvidia-graphics-drivers-515 transition=nvidia-graphics-drivers-510 transition=nvidia-graphics-drivers-495
-nvidia-graphics-drivers-535 535.161.07-0ubuntu0.20.04.1 arch=amd64 variant=open transition=nvidia-graphics-drivers-530-open transition=nvidia-graphics-drivers-525-open
+nvidia-graphics-drivers-535 535.171.04-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-530 transition=nvidia-graphics-drivers-525 transition=nvidia-graphics-drivers-520 transition=nvidia-graphics-drivers-515 transition=nvidia-graphics-drivers-510 transition=nvidia-graphics-drivers-495
+nvidia-graphics-drivers-535 535.171.04-0ubuntu0.20.04.1 arch=amd64 variant=open transition=nvidia-graphics-drivers-530-open transition=nvidia-graphics-drivers-525-open
 nvidia-graphics-drivers-418-server 418.226.00-0ubuntu0.20.04.2 arch=amd64
 nvidia-graphics-drivers-450-server 450.248.02-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-440-server
 nvidia-graphics-drivers-470-server 470.239.06-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-460-server
-nvidia-graphics-drivers-535-server 535.161.07-0ubuntu0.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-525-server transition=nvidia-graphics-drivers-515-server transition=nvidia-graphics-drivers-510-server
-nvidia-graphics-drivers-535-server 535.161.07-0ubuntu0.20.04.1 arch=amd64 variant=open
+nvidia-graphics-drivers-535-server 535.161.08-0ubuntu2.20.04.1 arch=amd64 transition=nvidia-graphics-drivers-525-server transition=nvidia-graphics-drivers-515-server transition=nvidia-graphics-drivers-510-server
+nvidia-graphics-drivers-535-server 535.161.08-0ubuntu2.20.04.1 arch=amd64 variant=open