diff -u linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/changelog linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/changelog
--- linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/changelog
+++ linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/changelog
@@ -1,11 +1,19 @@
-linux-nvidia-5.19 (5.19.0-1016.16) jammy; urgency=medium
+linux-nvidia-5.19 (5.19.0-1017.17) jammy; urgency=medium
 
-  * jammy/linux-nvidia-5.19: 5.19.0-1016.16 -proposed tracker (LP: #2028579)
+  * jammy/linux-nvidia-5.19: 5.19.0-1017.17 -proposed tracker (LP: #2028579)
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] resync update-dkms-versions helper
+    - [Packaging] update variants
+    - [Packaging] resync getabis
 
   * Pull-request for setting CPU frequency gov to performance (LP: #2028576)
     - [Configs] nvidia-5.19: Update PREEMPT and CPU_FREQ configs
 
- -- Brad Figg <bfigg@nvidia.com>  Mon, 24 Jul 2023 15:45:18 -0700
+  * Miscellaneous Ubuntu changes
+    - [Configs] nvidia-5.19: update gcc version
+
+ -- Ian May <ian.may@canonical.com>  Wed, 26 Jul 2023 22:35:53 -0500
 
 linux-nvidia-5.19 (5.19.0-1015.15) jammy; urgency=medium
 
diff -u linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/config/amd64/config.common.amd64 linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/config/amd64/config.common.amd64
--- linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/config/amd64/config.common.amd64
+++ linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/config/amd64/config.common.amd64
@@ -12,7 +12,7 @@
 CONFIG_ARCH_NR_GPIO=1024
 CONFIG_ATA_GENERIC=y
 CONFIG_ATA_PIIX=y
-CONFIG_CC_VERSION_TEXT="x86_64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
+CONFIG_CC_VERSION_TEXT="x86_64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04.1) 11.3.0"
 # CONFIG_CMA is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
diff -u linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/config/arm64/config.common.arm64 linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/config/arm64/config.common.arm64
--- linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/config/arm64/config.common.arm64
+++ linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/config/arm64/config.common.arm64
@@ -9,7 +9,7 @@
 CONFIG_ARCH_NR_GPIO=2048
 CONFIG_ATA_GENERIC=m
 CONFIG_ATA_PIIX=m
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04.1) 11.3.0"
 CONFIG_CMA=y
 CONFIG_COMEDI_TESTS_EXAMPLE=m
 CONFIG_COMEDI_TESTS_NI_ROUTES=m
diff -u linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/config/config.common.ubuntu linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/config/config.common.ubuntu
--- linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/config/config.common.ubuntu
+++ linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/config/config.common.ubuntu
@@ -3645,7 +3645,7 @@
 CONFIG_GART_IOMMU=y
 CONFIG_GCC12_NO_ARRAY_BOUNDS=y
 CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_GCC_VERSION=110400
+CONFIG_GCC_VERSION=110300
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_GDB_SCRIPTS=y
 CONFIG_GEMINI_ETHERNET=m
diff -u linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/control.stub.in linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/control.stub.in
--- linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/control.stub.in
+++ linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/control.stub.in
@@ -74,18 +74,6 @@
  that want the latest kernel headers. Please read
  /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details
 
-Package: SRCPKGNAME-tools-common
-Build-Profiles: <!stage1>
-Architecture: all
-Multi-Arch: foreign
-Section: kernel
-Priority: optional
-Depends: ${misc:Depends}, lsb-release
-Description: Linux kernel version specific tools for version PKGVER
- This package provides the architecture independent parts for kernel
- version locked tools (such as perf and x86_energy_perf_policy) for
- version PKGVER.
-
 Package: SRCPKGNAME-tools-PKGVER-ABINUM
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
@@ -99,17 +87,6 @@
  =HUMAN=.
  You probably want to install linux-tools-PKGVER-ABINUM-<flavour>.
 
-Package: SRCPKGNAME-cloud-tools-common
-Build-Profiles: <!stage1>
-Architecture: all
-Multi-Arch: foreign
-Section: kernel
-Priority: optional
-Depends: ${misc:Depends}
-Description: Linux kernel version specific cloud tools for version PKGVER
- This package provides the architecture independent parts for kernel
- version locked tools for cloud tools for version PKGVER.
-
 Package: SRCPKGNAME-cloud-tools-PKGVER-ABINUM
 Build-Profiles: <!stage1>
 Architecture: amd64
diff -u linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/rules.d/amd64.mk linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/rules.d/amd64.mk
--- linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/rules.d/amd64.mk
+++ linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/rules.d/amd64.mk
@@ -16,8 +16,3 @@
 do_tools_bpftool = true
-do_tools_x86	= true
-do_tools_hyperv	= true
-do_tools_host = true
 do_extras_package = true
-do_tools_common = true
-do_tools_acpidbg = true
 do_odm_drivers  = false
diff -u linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/rules.d/hooks.mk linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/rules.d/hooks.mk
--- linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/rules.d/hooks.mk
+++ linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/rules.d/hooks.mk
@@ -6,0 +7 @@
+do_tools_common = false
diff -u linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/variants linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/variants
--- linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/variants
+++ linux-nvidia-5.19-5.19.0/debian.nvidia-5.19/variants
@@ -1,0 +2 @@
+-hwe-22.04
diff -u linux-nvidia-5.19-5.19.0/debian/changelog linux-nvidia-5.19-5.19.0/debian/changelog
--- linux-nvidia-5.19-5.19.0/debian/changelog
+++ linux-nvidia-5.19-5.19.0/debian/changelog
@@ -1,11 +1,19 @@
-linux-nvidia-5.19 (5.19.0-1016.16) jammy; urgency=medium
+linux-nvidia-5.19 (5.19.0-1017.17) jammy; urgency=medium
 
-  * jammy/linux-nvidia-5.19: 5.19.0-1016.16 -proposed tracker (LP: #2028579)
+  * jammy/linux-nvidia-5.19: 5.19.0-1017.17 -proposed tracker (LP: #2028579)
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] resync update-dkms-versions helper
+    - [Packaging] update variants
+    - [Packaging] resync getabis
 
   * Pull-request for setting CPU frequency gov to performance (LP: #2028576)
     - [Configs] nvidia-5.19: Update PREEMPT and CPU_FREQ configs
 
- -- Brad Figg <bfigg@nvidia.com>  Mon, 24 Jul 2023 15:45:18 -0700
+  * Miscellaneous Ubuntu changes
+    - [Configs] nvidia-5.19: update gcc version
+
+ -- Ian May <ian.may@canonical.com>  Wed, 26 Jul 2023 22:35:53 -0500
 
 linux-nvidia-5.19 (5.19.0-1015.15) jammy; urgency=medium
 
diff -u linux-nvidia-5.19-5.19.0/debian/control linux-nvidia-5.19-5.19.0/debian/control
--- linux-nvidia-5.19-5.19.0/debian/control
+++ linux-nvidia-5.19-5.19.0/debian/control
@@ -64,7 +64,7 @@
 XS-Testsuite: autopkgtest
 #XS-Testsuite-Depends: gcc-4.7 binutils
 
-Package: linux-nvidia-5.19-headers-5.19.0-1016
+Package: linux-nvidia-5.19-headers-5.19.0-1017
 Build-Profiles: <!stage1>
 Architecture: all
 Multi-Arch: foreign
@@ -74,55 +74,32 @@
 Description: Header files related to Linux kernel version 5.19.0
  This package provides kernel header files for version 5.19.0, for sites
  that want the latest kernel headers. Please read
- /usr/share/doc/linux-nvidia-5.19-headers-5.19.0-1016/debian.README.gz for details
+ /usr/share/doc/linux-nvidia-5.19-headers-5.19.0-1017/debian.README.gz for details
 
-Package: linux-nvidia-5.19-tools-common
-Build-Profiles: <!stage1>
-Architecture: all
-Multi-Arch: foreign
-Section: kernel
-Priority: optional
-Depends: ${misc:Depends}, lsb-release
-Description: Linux kernel version specific tools for version 5.19.0
- This package provides the architecture independent parts for kernel
- version locked tools (such as perf and x86_energy_perf_policy) for
- version 5.19.0.
-
-Package: linux-nvidia-5.19-tools-5.19.0-1016
+Package: linux-nvidia-5.19-tools-5.19.0-1017
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: devel
 Priority: optional
 Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common
-Description: Linux kernel version specific tools for version 5.19.0-1016
+Description: Linux kernel version specific tools for version 5.19.0-1017
  This package provides the architecture dependant parts for kernel
  version locked tools (such as perf and x86_energy_perf_policy) for
- version 5.19.0-1016 on
+ version 5.19.0-1017 on
  64 bit x86.
- You probably want to install linux-tools-5.19.0-1016-<flavour>.
-
-Package: linux-nvidia-5.19-cloud-tools-common
-Build-Profiles: <!stage1>
-Architecture: all
-Multi-Arch: foreign
-Section: kernel
-Priority: optional
-Depends: ${misc:Depends}
-Description: Linux kernel version specific cloud tools for version 5.19.0
- This package provides the architecture independent parts for kernel
- version locked tools for cloud tools for version 5.19.0.
+ You probably want to install linux-tools-5.19.0-1017-<flavour>.
 
-Package: linux-nvidia-5.19-cloud-tools-5.19.0-1016
+Package: linux-nvidia-5.19-cloud-tools-5.19.0-1017
 Build-Profiles: <!stage1>
 Architecture: amd64
 Section: devel
 Priority: optional
 Depends: ${misc:Depends}, ${shlibs:Depends}, linux-cloud-tools-common
-Description: Linux kernel version specific cloud tools for version 5.19.0-1016
+Description: Linux kernel version specific cloud tools for version 5.19.0-1017
  This package provides the architecture dependant parts for kernel
- version locked tools for cloud tools for version 5.19.0-1016 on
+ version locked tools for cloud tools for version 5.19.0-1017 on
  64 bit x86.
- You probably want to install linux-cloud-tools-5.19.0-1016-<flavour>.
+ You probably want to install linux-cloud-tools-5.19.0-1017-<flavour>.
 
 Package: linux-nvidia-5.19-tools-host
 Build-Profiles: <!stage1>
@@ -136,17 +113,17 @@
 
 
 
-Package: linux-image-unsigned-5.19.0-1016-nvidia
+Package: linux-image-unsigned-5.19.0-1017-nvidia
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: kernel
 Priority: optional
 Provides: linux-image, fuse-module, kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64], ${linux:rprovides}
-Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-5.19.0-1016-nvidia
+Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-5.19.0-1017-nvidia
 Recommends: grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | flash-kernel [arm64] | grub-efi-arm64 [arm64], initramfs-tools | linux-initramfs-tool
 Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x]
-Conflicts: linux-image-5.19.0-1016-nvidia
-Suggests: fdutils, linux-doc | linux-nvidia-5.19-source-5.19.0, linux-nvidia-5.19-tools, linux-headers-5.19.0-1016-nvidia, linux-modules-extra-5.19.0-1016-nvidia
+Conflicts: linux-image-5.19.0-1017-nvidia
+Suggests: fdutils, linux-doc | linux-nvidia-5.19-source-5.19.0, linux-nvidia-5.19-tools, linux-headers-5.19.0-1017-nvidia, linux-modules-extra-5.19.0-1017-nvidia
 Description: Linux kernel image for version 5.19.0 on 64 bit x86 SMP
  This package contains the unsigned Linux kernel image for version 5.19.0 on
  64 bit x86 SMP.
@@ -159,7 +136,7 @@
  the linux-nvidia meta-package, which will ensure that upgrades work
  correctly, and that supporting packages are also installed.
 
-Package: linux-modules-5.19.0-1016-nvidia
+Package: linux-modules-5.19.0-1017-nvidia
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: kernel
@@ -179,12 +156,12 @@
  the linux-nvidia meta-package, which will ensure that upgrades work
  correctly, and that supporting packages are also installed.
 
-Package: linux-modules-extra-5.19.0-1016-nvidia
+Package: linux-modules-extra-5.19.0-1017-nvidia
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: kernel
 Priority: optional
-Depends: ${misc:Depends}, ${shlibs:Depends}, linux-modules-5.19.0-1016-nvidia, wireless-regdb
+Depends: ${misc:Depends}, ${shlibs:Depends}, linux-modules-5.19.0-1017-nvidia, wireless-regdb
 Description: Linux kernel extra modules for version 5.19.0 on 64 bit x86 SMP
  This package contains the Linux kernel extra modules for version 5.19.0 on
  64 bit x86 SMP.
@@ -201,21 +178,21 @@
  the linux-nvidia meta-package, which will ensure that upgrades work
  correctly, and that supporting packages are also installed.
 
-Package: linux-headers-5.19.0-1016-nvidia
+Package: linux-headers-5.19.0-1017-nvidia
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, linux-nvidia-5.19-headers-5.19.0-1016, ${shlibs:Depends}
+Depends: ${misc:Depends}, linux-nvidia-5.19-headers-5.19.0-1017, ${shlibs:Depends}
 Provides: linux-headers, linux-headers-3.0
 Description: Linux kernel headers for version 5.19.0 on 64 bit x86 SMP
  This package provides kernel header files for version 5.19.0 on
  64 bit x86 SMP.
  .
  This is for sites that want the latest kernel headers.  Please read
- /usr/share/doc/linux-headers-5.19.0-1016/debian.README.gz for details.
+ /usr/share/doc/linux-headers-5.19.0-1017/debian.README.gz for details.
 
-Package: linux-image-unsigned-5.19.0-1016-nvidia-dbgsym
+Package: linux-image-unsigned-5.19.0-1017-nvidia-dbgsym
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: devel
@@ -232,31 +209,31 @@
  is uncompressed, and unstripped. This package also includes the
  unstripped modules.
 
-Package: linux-tools-5.19.0-1016-nvidia
+Package: linux-tools-5.19.0-1017-nvidia
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, linux-nvidia-5.19-tools-5.19.0-1016
-Description: Linux kernel version specific tools for version 5.19.0-1016
+Depends: ${misc:Depends}, linux-nvidia-5.19-tools-5.19.0-1017
+Description: Linux kernel version specific tools for version 5.19.0-1017
  This package provides the architecture dependant parts for kernel
  version locked tools (such as perf and x86_energy_perf_policy) for
- version 5.19.0-1016 on
+ version 5.19.0-1017 on
  64 bit x86.
 
-Package: linux-cloud-tools-5.19.0-1016-nvidia
+Package: linux-cloud-tools-5.19.0-1017-nvidia
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, linux-nvidia-5.19-cloud-tools-5.19.0-1016
-Description: Linux kernel version specific cloud tools for version 5.19.0-1016
+Depends: ${misc:Depends}, linux-nvidia-5.19-cloud-tools-5.19.0-1017
+Description: Linux kernel version specific cloud tools for version 5.19.0-1017
  This package provides the architecture dependant parts for kernel
- version locked tools for cloud for version 5.19.0-1016 on
+ version locked tools for cloud for version 5.19.0-1017 on
  64 bit x86.
 
 
-Package: linux-buildinfo-5.19.0-1016-nvidia
+Package: linux-buildinfo-5.19.0-1017-nvidia
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: kernel
@@ -270,18 +247,18 @@
  You likely do not want to install this package.
 
 
-Package: linux-modules-nvidia-fs-5.19.0-1016-nvidia
+Package: linux-modules-nvidia-fs-5.19.0-1017-nvidia
 Build-Profiles: <!stage1>
 Architecture: amd64 arm64
 Section: kernel
 Priority: optional
 Depends:
  ${misc:Depends},
- linux-image-5.19.0-1016-nvidia | linux-image-unsigned-5.19.0-1016-nvidia,
+ linux-image-5.19.0-1017-nvidia | linux-image-unsigned-5.19.0-1017-nvidia,
 Built-Using: ${linux:BuiltUsing}
-Description: Linux kernel nvidia-fs modules for version 5.19.0-1016
+Description: Linux kernel nvidia-fs modules for version 5.19.0-1017
  This package provides the Linux kernel nvidia-fs modules for version
- 5.19.0-1016.
+ 5.19.0-1017.
  .
  You likely do not want to install this package directly. Instead, install the
  one of the linux-modules-nvidia-fs-nvidia* meta-packages,
@@ -289,17 +266,17 @@
  also installed.
 
 
-Package: linux-image-unsigned-5.19.0-1016-nvidia-64k
+Package: linux-image-unsigned-5.19.0-1017-nvidia-64k
 Build-Profiles: <!stage1>
 Architecture: arm64
 Section: kernel
 Priority: optional
 Provides: linux-image, fuse-module, kvm-api-4, redhat-cluster-modules, ivtv-modules, ${linux:rprovides}
-Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-5.19.0-1016-nvidia-64k
+Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-5.19.0-1017-nvidia-64k
 Recommends: grub-efi-arm64 [arm64] | flash-kernel [arm64], initramfs-tools | linux-initramfs-tool
 Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x]
-Conflicts: linux-image-5.19.0-1016-nvidia-64k
-Suggests: fdutils, linux-doc | linux-nvidia-5.19-source-5.19.0, linux-nvidia-5.19-tools, linux-headers-5.19.0-1016-nvidia-64k, linux-modules-extra-5.19.0-1016-nvidia-64k
+Conflicts: linux-image-5.19.0-1017-nvidia-64k
+Suggests: fdutils, linux-doc | linux-nvidia-5.19-source-5.19.0, linux-nvidia-5.19-tools, linux-headers-5.19.0-1017-nvidia-64k, linux-modules-extra-5.19.0-1017-nvidia-64k
 Description: Linux kernel image for version 5.19.0 on 64 bit x86 SMP
  This package contains the unsigned Linux kernel image for version 5.19.0 on
  64 bit x86 SMP.
@@ -312,7 +289,7 @@
  the linux-nvidia-64k meta-package, which will ensure that upgrades work
  correctly, and that supporting packages are also installed.
 
-Package: linux-modules-5.19.0-1016-nvidia-64k
+Package: linux-modules-5.19.0-1017-nvidia-64k
 Build-Profiles: <!stage1>
 Architecture: arm64
 Section: kernel
@@ -332,12 +309,12 @@
  the linux-nvidia-64k meta-package, which will ensure that upgrades work
  correctly, and that supporting packages are also installed.
 
-Package: linux-modules-extra-5.19.0-1016-nvidia-64k
+Package: linux-modules-extra-5.19.0-1017-nvidia-64k
 Build-Profiles: <!stage1>
 Architecture: arm64
 Section: kernel
 Priority: optional
-Depends: ${misc:Depends}, ${shlibs:Depends}, linux-modules-5.19.0-1016-nvidia-64k, wireless-regdb
+Depends: ${misc:Depends}, ${shlibs:Depends}, linux-modules-5.19.0-1017-nvidia-64k, wireless-regdb
 Description: Linux kernel extra modules for version 5.19.0 on 64 bit x86 SMP
  This package contains the Linux kernel extra modules for version 5.19.0 on
  64 bit x86 SMP.
@@ -354,21 +331,21 @@
  the linux-nvidia-64k meta-package, which will ensure that upgrades work
  correctly, and that supporting packages are also installed.
 
-Package: linux-headers-5.19.0-1016-nvidia-64k
+Package: linux-headers-5.19.0-1017-nvidia-64k
 Build-Profiles: <!stage1>
 Architecture: arm64
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, linux-nvidia-5.19-headers-5.19.0-1016, ${shlibs:Depends}
+Depends: ${misc:Depends}, linux-nvidia-5.19-headers-5.19.0-1017, ${shlibs:Depends}
 Provides: linux-headers, linux-headers-3.0
 Description: Linux kernel headers for version 5.19.0 on 64 bit x86 SMP
  This package provides kernel header files for version 5.19.0 on
  64 bit x86 SMP.
  .
  This is for sites that want the latest kernel headers.  Please read
- /usr/share/doc/linux-headers-5.19.0-1016/debian.README.gz for details.
+ /usr/share/doc/linux-headers-5.19.0-1017/debian.README.gz for details.
 
-Package: linux-image-unsigned-5.19.0-1016-nvidia-64k-dbgsym
+Package: linux-image-unsigned-5.19.0-1017-nvidia-64k-dbgsym
 Build-Profiles: <!stage1>
 Architecture: arm64
 Section: devel
@@ -385,31 +362,31 @@
  is uncompressed, and unstripped. This package also includes the
  unstripped modules.
 
-Package: linux-tools-5.19.0-1016-nvidia-64k
+Package: linux-tools-5.19.0-1017-nvidia-64k
 Build-Profiles: <!stage1>
 Architecture: arm64
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, linux-nvidia-5.19-tools-5.19.0-1016
-Description: Linux kernel version specific tools for version 5.19.0-1016
+Depends: ${misc:Depends}, linux-nvidia-5.19-tools-5.19.0-1017
+Description: Linux kernel version specific tools for version 5.19.0-1017
  This package provides the architecture dependant parts for kernel
  version locked tools (such as perf and x86_energy_perf_policy) for
- version 5.19.0-1016 on
+ version 5.19.0-1017 on
  64 bit x86.
 
-Package: linux-cloud-tools-5.19.0-1016-nvidia-64k
+Package: linux-cloud-tools-5.19.0-1017-nvidia-64k
 Build-Profiles: <!stage1>
 Architecture: arm64
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, linux-nvidia-5.19-cloud-tools-5.19.0-1016
-Description: Linux kernel version specific cloud tools for version 5.19.0-1016
+Depends: ${misc:Depends}, linux-nvidia-5.19-cloud-tools-5.19.0-1017
+Description: Linux kernel version specific cloud tools for version 5.19.0-1017
  This package provides the architecture dependant parts for kernel
- version locked tools for cloud for version 5.19.0-1016 on
+ version locked tools for cloud for version 5.19.0-1017 on
  64 bit x86.
 
 
-Package: linux-buildinfo-5.19.0-1016-nvidia-64k
+Package: linux-buildinfo-5.19.0-1017-nvidia-64k
 Build-Profiles: <!stage1>
 Architecture: arm64
 Section: kernel
@@ -423,18 +400,18 @@
  You likely do not want to install this package.
 
 
-Package: linux-modules-nvidia-fs-5.19.0-1016-nvidia-64k
+Package: linux-modules-nvidia-fs-5.19.0-1017-nvidia-64k
 Build-Profiles: <!stage1>
 Architecture: arm64
 Section: kernel
 Priority: optional
 Depends:
  ${misc:Depends},
- linux-image-5.19.0-1016-nvidia-64k | linux-image-unsigned-5.19.0-1016-nvidia-64k,
+ linux-image-5.19.0-1017-nvidia-64k | linux-image-unsigned-5.19.0-1017-nvidia-64k,
 Built-Using: ${linux:BuiltUsing}
-Description: Linux kernel nvidia-fs modules for version 5.19.0-1016
+Description: Linux kernel nvidia-fs modules for version 5.19.0-1017
  This package provides the Linux kernel nvidia-fs modules for version
- 5.19.0-1016.
+ 5.19.0-1017.
  .
  You likely do not want to install this package directly. Instead, install the
  one of the linux-modules-nvidia-fs-nvidia-64k* meta-packages,
@@ -442,17 +419,17 @@
  also installed.
 
 
-Package: linux-image-unsigned-5.19.0-1016-nvidia-lowlatency
+Package: linux-image-unsigned-5.19.0-1017-nvidia-lowlatency
 Build-Profiles: <!stage1>
 Architecture: amd64
 Section: kernel
 Priority: optional
 Provides: linux-image, fuse-module, kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64], ${linux:rprovides}
-Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-5.19.0-1016-nvidia-lowlatency
+Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-5.19.0-1017-nvidia-lowlatency
 Recommends: grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | flash-kernel [arm64] | grub-efi-arm64 [arm64], initramfs-tools | linux-initramfs-tool
 Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x]
-Conflicts: linux-image-5.19.0-1016-nvidia-lowlatency
-Suggests: fdutils, linux-doc | linux-nvidia-5.19-source-5.19.0, linux-nvidia-5.19-tools, linux-headers-5.19.0-1016-nvidia-lowlatency, linux-modules-extra-5.19.0-1016-nvidia-lowlatency
+Conflicts: linux-image-5.19.0-1017-nvidia-lowlatency
+Suggests: fdutils, linux-doc | linux-nvidia-5.19-source-5.19.0, linux-nvidia-5.19-tools, linux-headers-5.19.0-1017-nvidia-lowlatency, linux-modules-extra-5.19.0-1017-nvidia-lowlatency
 Description: Linux kernel image for version 5.19.0 on 64 bit x86 SMP
  This package contains the unsigned Linux kernel image for version 5.19.0 on
  64 bit x86 SMP.
@@ -465,7 +442,7 @@
  the linux-nvidia-lowlatency meta-package, which will ensure that upgrades work
  correctly, and that supporting packages are also installed.
 
-Package: linux-modules-5.19.0-1016-nvidia-lowlatency
+Package: linux-modules-5.19.0-1017-nvidia-lowlatency
 Build-Profiles: <!stage1>
 Architecture: amd64
 Section: kernel
@@ -485,12 +462,12 @@
  the linux-nvidia-lowlatency meta-package, which will ensure that upgrades work
  correctly, and that supporting packages are also installed.
 
-Package: linux-modules-extra-5.19.0-1016-nvidia-lowlatency
+Package: linux-modules-extra-5.19.0-1017-nvidia-lowlatency
 Build-Profiles: <!stage1>
 Architecture: amd64
 Section: kernel
 Priority: optional
-Depends: ${misc:Depends}, ${shlibs:Depends}, linux-modules-5.19.0-1016-nvidia-lowlatency, wireless-regdb
+Depends: ${misc:Depends}, ${shlibs:Depends}, linux-modules-5.19.0-1017-nvidia-lowlatency, wireless-regdb
 Description: Linux kernel extra modules for version 5.19.0 on 64 bit x86 SMP
  This package contains the Linux kernel extra modules for version 5.19.0 on
  64 bit x86 SMP.
@@ -507,21 +484,21 @@
  the linux-nvidia-lowlatency meta-package, which will ensure that upgrades work
  correctly, and that supporting packages are also installed.
 
-Package: linux-headers-5.19.0-1016-nvidia-lowlatency
+Package: linux-headers-5.19.0-1017-nvidia-lowlatency
 Build-Profiles: <!stage1>
 Architecture: amd64
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, linux-nvidia-5.19-headers-5.19.0-1016, ${shlibs:Depends}
+Depends: ${misc:Depends}, linux-nvidia-5.19-headers-5.19.0-1017, ${shlibs:Depends}
 Provides: linux-headers, linux-headers-3.0
 Description: Linux kernel headers for version 5.19.0 on 64 bit x86 SMP
  This package provides kernel header files for version 5.19.0 on
  64 bit x86 SMP.
  .
  This is for sites that want the latest kernel headers.  Please read
- /usr/share/doc/linux-headers-5.19.0-1016/debian.README.gz for details.
+ /usr/share/doc/linux-headers-5.19.0-1017/debian.README.gz for details.
 
-Package: linux-image-unsigned-5.19.0-1016-nvidia-lowlatency-dbgsym
+Package: linux-image-unsigned-5.19.0-1017-nvidia-lowlatency-dbgsym
 Build-Profiles: <!stage1>
 Architecture: amd64
 Section: devel
@@ -538,31 +515,31 @@
  is uncompressed, and unstripped. This package also includes the
  unstripped modules.
 
-Package: linux-tools-5.19.0-1016-nvidia-lowlatency
+Package: linux-tools-5.19.0-1017-nvidia-lowlatency
 Build-Profiles: <!stage1>
 Architecture: amd64
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, linux-nvidia-5.19-tools-5.19.0-1016
-Description: Linux kernel version specific tools for version 5.19.0-1016
+Depends: ${misc:Depends}, linux-nvidia-5.19-tools-5.19.0-1017
+Description: Linux kernel version specific tools for version 5.19.0-1017
  This package provides the architecture dependant parts for kernel
  version locked tools (such as perf and x86_energy_perf_policy) for
- version 5.19.0-1016 on
+ version 5.19.0-1017 on
  64 bit x86.
 
-Package: linux-cloud-tools-5.19.0-1016-nvidia-lowlatency
+Package: linux-cloud-tools-5.19.0-1017-nvidia-lowlatency
 Build-Profiles: <!stage1>
 Architecture: amd64
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, linux-nvidia-5.19-cloud-tools-5.19.0-1016
-Description: Linux kernel version specific cloud tools for version 5.19.0-1016
+Depends: ${misc:Depends}, linux-nvidia-5.19-cloud-tools-5.19.0-1017
+Description: Linux kernel version specific cloud tools for version 5.19.0-1017
  This package provides the architecture dependant parts for kernel
- version locked tools for cloud for version 5.19.0-1016 on
+ version locked tools for cloud for version 5.19.0-1017 on
  64 bit x86.
 
 
-Package: linux-buildinfo-5.19.0-1016-nvidia-lowlatency
+Package: linux-buildinfo-5.19.0-1017-nvidia-lowlatency
 Build-Profiles: <!stage1>
 Architecture: amd64
 Section: kernel
@@ -576,18 +553,18 @@
  You likely do not want to install this package.
 
 
-Package: linux-modules-nvidia-fs-5.19.0-1016-nvidia-lowlatency
+Package: linux-modules-nvidia-fs-5.19.0-1017-nvidia-lowlatency
 Build-Profiles: <!stage1>
 Architecture: amd64
 Section: kernel
 Priority: optional
 Depends:
  ${misc:Depends},
- linux-image-5.19.0-1016-nvidia-lowlatency | linux-image-unsigned-5.19.0-1016-nvidia-lowlatency,
+ linux-image-5.19.0-1017-nvidia-lowlatency | linux-image-unsigned-5.19.0-1017-nvidia-lowlatency,
 Built-Using: ${linux:BuiltUsing}
-Description: Linux kernel nvidia-fs modules for version 5.19.0-1016
+Description: Linux kernel nvidia-fs modules for version 5.19.0-1017
  This package provides the Linux kernel nvidia-fs modules for version
- 5.19.0-1016.
+ 5.19.0-1017.
  .
  You likely do not want to install this package directly. Instead, install the
  one of the linux-modules-nvidia-fs-nvidia-lowlatency* meta-packages,
diff -u linux-nvidia-5.19-5.19.0/debian/scripts/misc/getabis linux-nvidia-5.19-5.19.0/debian/scripts/misc/getabis
--- linux-nvidia-5.19-5.19.0/debian/scripts/misc/getabis
+++ linux-nvidia-5.19-5.19.0/debian/scripts/misc/getabis
@@ -161,6 +161,9 @@
 			do
 				mv "$base/$comp" "$abidir/$arch/$sub.$comp"
 			done
+			if [ -e "${base}"/modules.builtin ] ; then
+				mv "${base}"/modules.builtin "${abidir}/${arch}/${sub}".modules.builtin
+			fi
 			cat "$base/fwinfo" >>"$fwinfo"
 			if [ -e "${base}"/fwinfo.builtin ] ; then
 				cat "${base}"/fwinfo.builtin >> "${fwinfo}".builtin
diff -u linux-nvidia-5.19-5.19.0/update-dkms-versions linux-nvidia-5.19-5.19.0/update-dkms-versions
--- linux-nvidia-5.19-5.19.0/update-dkms-versions
+++ linux-nvidia-5.19-5.19.0/update-dkms-versions
@@ -77,7 +77,6 @@
 #  https://git.launchpad.net/~canonical-kernel/+git/kernel-versions/plain/README
 #
 kv_repo="$HOME/.cache/kernel-versions-bare"
-git_base="$remote_name/$sru_cycle"
 
 # Now we know where our repo is and what it called update it.
 # We maintain "persistent" remotes for main and security, but assume
@@ -100,13 +99,24 @@
 	(cd "$kv_repo" && git cat-file "$@") || exit 1
 }
 
+# Determine if this is merge format (main branch exists).
+present=$(cat_file -t "$remote_name/main" 2>/dev/null)
+if [ "$present" ]; then
+	git_base="$remote_name/main:$sru_cycle/"
+	git_base_devel="$remote_name/main:tip/"
+else
+	git_base="$remote_name/$sru_cycle:"
+	git_base_devel="$remote_name/master:"
+fi
+git_human="$remote_name/$sru_cycle"
+
 # Determine if we have this cycle.
 present=$(cat_file -t "$git_base" 2>/dev/null)
 if [ "$present" = "" ]; then
 	# If we don't have the cycle in the development cycle then
 	# fall back to master.
 	case "$sru_cycle" in
-	d*)	git_base="$remote_name/master" ;;
+	d*)	git_base="$git_base_devel" ;;
 	*)	echo "$sru_cycle: cycle not found in $remote_repo" 2>&1
 		exit 1
 		;;
@@ -146,7 +156,7 @@
 	"$our_mainline"
 do
 	echo "II: trying $versions_path_tail ..."
-	versions_paths=$(echo $(cat_file -p "$git_base:map/dkms-versions/$versions_path_tail" 2>/dev/null))
+	versions_paths=$(echo $(cat_file -p "${git_base}map/dkms-versions/$versions_path_tail" 2>/dev/null))
 	[ -n "$versions_paths" ] && break
 done
 
@@ -161,7 +171,7 @@
 : ">debian/dkms-versions.new"
 for versions_path in $versions_paths
 do
-	cat_file -p "$git_base:$versions_path" >>"debian/dkms-versions.new"
+	cat_file -p "$git_base$versions_path" >>"debian/dkms-versions.new"
 	if [ "$?" -ne 0 ]; then
 		echo "$0: unable to download an updated dkms-versions file" 1>&2
 		exit 1
@@ -171,7 +181,7 @@
 
 thing="debian/dkms-versions"
 if ! git diff --exit-code -- "$thing" >/dev/null; then
-	git commit -m "UBUNTU: $thing -- update from kernel-versions ($git_base)" \
+	git commit -m "UBUNTU: $thing -- update from kernel-versions ($git_human)" \
 		-m "BugLink: https://bugs.launchpad.net/bugs/1786013" \
 		-s -- "$thing"
 else