diff --git a/debian/README.source b/debian/README.source
index a03295fa6..6c3a43c32 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -26,9 +26,9 @@ Upstream support timeframes
     304                 12/2017 EoL
     340                 12/2019 EoL
     390                 12/2022 EoL
-    Tesla 410                   EoL
+    Tesla 410 (PB)      ??      EoL
     Tesla 418 (LTSB)    03/2022 EoL
-    Tesla 440           11/2020 EoL
+    Tesla 440 (PB)      11/2020 EoL
     Tesla 450 (LTSB)    07/2023 EoL
     Tesla 460 (PB)      01/2022 EoL
     Tesla 470 (LTSB)    07/2024
diff --git a/debian/changelog b/debian/changelog
index 670a42325..ed562f33d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,27 @@
+nvidia-graphics-drivers (470.256.02-1) bullseye; urgency=medium
+
+  * New upstream LTS and Tesla branch release 470.256.02 (2024-06-04).
+    * Fixed CVE-2024-0090, CVE-2024-0092.  (Closes: #1072792)
+      https://nvidia.custhelp.com/app/answers/detail/a_id/5551
+    - Fixed a bug that could cause the X server to crash when graphics
+      applications requested single-buffered drawables while certain
+      features (such as Vulkan sharpening) are enabled.
+
+  [ Andreas Beckmann ]
+  * Refresh patches.
+  * xserver-xorg-video-nvidia: Recommend nvidia-vulkan-icd.
+  * Move the libnvidia-glvkspirv dependency to libnvidia-(e)glcore.
+    (Cf. #1064194)
+  * Bump Standards-Version to 4.7.0. No changes needed.
+
+ -- Andreas Beckmann <anbe@debian.org>  Sun, 09 Jun 2024 09:55:50 +0200
+
 nvidia-graphics-drivers (470.239.06-1) bullseye; urgency=medium
 
-  * New upstream long term support branch release 470.239.06 (2024-02-22).
+  * New upstream LTS and Tesla branch release 470.239.06 (2024-02-22).
     * Fixed CVE-2024-0074, CVE-2024-0078, CVE-2022-42265.  (Closes: #1064983)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5520
+    - Minor bug fixes and improvements
     * Improved compatibility with recent Linux kernels.
 
   [ Andreas Beckmann ]
@@ -40,7 +59,7 @@ nvidia-graphics-drivers (470.223.02-2) bullseye; urgency=medium
 
 nvidia-graphics-drivers (470.223.02-1) bullseye; urgency=medium
 
-  * New upstream long term support branch release 470.223.02 (2023-10-31).
+  * New upstream LTS and Tesla branch release 470.223.02 (2023-10-31).
     * Fixed CVE-2023-31022.  (Closes: #1055136)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5491
     - Fixed a bug which caused incorrect reporting of presentation
@@ -78,7 +97,7 @@ nvidia-graphics-drivers (470.199.02-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (470.199.02-1) bullseye; urgency=medium
 
-  * New upstream long term support branch release 470.199.02 (2023-06-26).
+  * New upstream LTS and Tesla branch release 470.199.02 (2023-06-26).
     * Fixed CVE-2023-25515, CVE-2023-25516.  (Closes: #1039678)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5468
     * Improved compatibility with recent Linux kernels.
@@ -100,7 +119,7 @@ nvidia-graphics-drivers (470.182.03-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (470.182.03-1) bullseye; urgency=medium
 
-  * New upstream long term support branch release 470.182.03 (2023-03-30).
+  * New upstream LTS and Tesla branch release 470.182.03 (2023-03-30).
     * Fixed CVE-2023-0184, CVE-2023-0189, CVE-2023-0180, CVE-2023-0185,
       CVE-2023-0187, CVE-2023-0198, CVE-2023-0199, CVE-2023-0188,
       CVE-2023-0190, CVE-2023-0194, CVE-2023-0195, CVE-2023-0191.
@@ -147,7 +166,7 @@ nvidia-graphics-drivers (470.161.03-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (470.161.03-1) bullseye; urgency=medium
 
-  * New upstream long term support branch release 470.161.03 (2022-11-22).
+  * New upstream LTS and Tesla branch release 470.161.03 (2022-11-22).
     * Fixed CVE-2022-34670, CVE-2022-34674, CVE-2022-34675, CVE-2022-34677,
       CVE-2022-34679, CVE-2022-34680, CVE-2022-34682, CVE-2022-42254,
       CVE-2022-42255, CVE-2022-42256, CVE-2022-42257, CVE-2022-42258,
@@ -157,7 +176,7 @@ nvidia-graphics-drivers (470.161.03-1) bullseye; urgency=medium
     - Fixed a bug that caused the Xorg server to crash if an NvFBC capture
       session is started while video memory is full.
     * Improved compatibility with recent Linux kernels.  (Closes: #1024852)
-  * New upstream Tesla release (amd64 only) 470.141.10 (2022-10-19).
+  * New upstream Tesla branch release (amd64 only) 470.141.10 (2022-10-19).
 
   [ Andreas Beckmann ]
   * Refresh patches.
@@ -195,7 +214,7 @@ nvidia-graphics-drivers (470.141.03-1~deb11u1) bullseye; urgency=medium
 
 nvidia-graphics-drivers (470.141.03-1) unstable; urgency=medium
 
-  * New upstream long term support branch release 470.141.03 (2022-08-02).
+  * New upstream LTS and Tesla branch release 470.141.03 (2022-08-02).
     * Fixed CVE-2022-31607, CVE-2022-31608, CVE-2022-31615. (Closes: #1016614)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5383
     - Added support for the following GPU: GeForce RTX 3050 OEM.
@@ -258,7 +277,7 @@ nvidia-graphics-drivers (470.129.06-2) unstable; urgency=medium
 
 nvidia-graphics-drivers (470.129.06-1) unstable; urgency=medium
 
-  * New upstream long term support branch release 470.129.06 (2022-05-16).
+  * New upstream LTS and Tesla branch release 470.129.06 (2022-05-16).
     * Fixed CVE-2022-28181, CVE-2022-28183, CVE-2022-28184, CVE-2022-28185,
       CVE-2022-28191, CVE-2022-28192.  (Closes: #1011140)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5353
@@ -325,7 +344,7 @@ nvidia-graphics-drivers (470.103.01-2) unstable; urgency=medium
 
 nvidia-graphics-drivers (470.103.01-1) unstable; urgency=medium
 
-  * New upstream long term support branch release 470.103.01 (2022-01-31).
+  * New upstream LTS and Tesla branch release 470.103.01 (2022-01-31).
     * Fixed CVE-2022-21813, CVE-2022-21814.  (Closes: #1004847)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5312
     - Added an application profile to avoid an image corruption issue in
@@ -373,7 +392,7 @@ nvidia-graphics-drivers (470.86-1) unstable; urgency=medium
 
 nvidia-graphics-drivers (470.82.01-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 470.82.01 (2021-11-02).
+  * New upstream production and Tesla branch release 470.82.01 (2021-11-02).
     - Fixed a regression which prevented DisplayPort and HDMI 2.1 variable
       refresh rate (VRR) G-SYNC Compatible monitors from functioning correctly
       in variable refresh rate mode, resulting in issues such as flickering.
@@ -458,7 +477,7 @@ nvidia-graphics-drivers (470.57.02-2) unstable; urgency=medium
 
 nvidia-graphics-drivers (470.57.02-1) experimental; urgency=medium
 
-  * New upstream production branch release 470.57.02 (2021-07-19).
+  * New upstream production and Tesla branch release 470.57.02 (2021-07-19).
     * Fixed CVE-2021-1093, CVE-2021-1094, CVE-2021-1095.  (Closes: #991351)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5211
     - Fixed a bug that could cause flickering in Blender and Steam when
@@ -658,10 +677,24 @@ nvidia-graphics-drivers (465.24.02-1) experimental; urgency=medium
 
  -- Andreas Beckmann <anbe@debian.org>  Tue, 27 Apr 2021 18:48:53 +0200
 
+nvidia-graphics-drivers (460.106.00-15) UNRELEASED; urgency=medium
+
+  * Backport drm_unlocked_ioctl_flag_present changes from 470.239.06 to fix
+    kernel module build for Linux 6.8.
+  * Backport screen_info changes from 470.182.03 and 470.239.06 to fix kernel
+    module build for Linux 6.7 on arm64.
+  * xserver-xorg-video-nvidia: Recommend nvidia-vulkan-icd.
+  * Move the libnvidia-glvkspirv dependency to libnvidia-(e)glcore.
+    (Cf. #1064194)
+  * Bump Standards-Version to 4.7.0. No changes needed.
+
+ -- Andreas Beckmann <anbe@debian.org>  Wed, 22 May 2024 02:37:04 +0200
+
 nvidia-graphics-drivers (460.106.00-14) UNRELEASED; urgency=medium
 
   * Apply pfn_valid patch from gentoo to fix kernel module build for
     Linux 6.1.76, 6.6.15, 6.7.3, 6.8.
+  * New Romanian (ro) debconf translations by Remus-Gabriel Chelu.
 
  -- Andreas Beckmann <anbe@debian.org>  Tue, 13 Feb 2024 14:49:02 +0100
 
@@ -803,7 +836,7 @@ nvidia-graphics-drivers (460.106.00-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (460.106.00-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 460.106.00 (2021-10-26).
+  * New upstream Tesla branch release 460.106.00 (2021-10-26).
 
   [ Andreas Beckmann ]
   * bug-script: Show the nvidia and glx alternatives (470.82.00-1).
@@ -832,7 +865,7 @@ nvidia-graphics-drivers (460.91.03-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (460.91.03-1) unstable; urgency=medium
 
-  * New upstream production branch release 460.91.03 (2021-07-20).
+  * New upstream production and Tesla branch release 460.91.03 (2021-07-20).
     * Fixed CVE-2021-1093, CVE-2021-1094, CVE-2021-1095.  (Closes: #991351)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5211
     - Added support for the following GPUs: GeForce RTX 3070 Ti, CMP 50HX.
@@ -884,7 +917,7 @@ nvidia-graphics-drivers (460.80-1) unstable; urgency=medium
 
 nvidia-graphics-drivers (460.73.01-1) unstable; urgency=medium
 
-  * New upstream production branch release 460.73.01 (2021-04-14).
+  * New upstream production and Tesla branch release 460.73.01 (2021-04-14).
     * Fixed CVE-2021-1076, CVE-2021-1077.  (Closes: #987216)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5172
     - Added support for the following GPUs: A10, A10G, A30, PG506-232,
@@ -972,7 +1005,7 @@ nvidia-graphics-drivers (460.32.03-2) unstable; urgency=medium
 
 nvidia-graphics-drivers (460.32.03-1) unstable; urgency=medium
 
-  * New upstream production branch release 460.32.03 (2021-01-07).
+  * New upstream production and Tesla branch release 460.32.03 (2021-01-07).
     * Fixed CVE-2021-1052, CVE-2021-1053, CVE-2021-1056.  (Closes: #979670)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5142
     - Added a new "NoInterlacedModes" token to the NVIDIA X driver's
@@ -1169,6 +1202,20 @@ nvidia-graphics-drivers (455.23.04-1) experimental; urgency=medium
 
  -- Andreas Beckmann <anbe@debian.org>  Thu, 24 Sep 2020 21:52:54 +0200
 
+nvidia-graphics-drivers (450.248.02-5) UNRELEASED; urgency=medium
+
+  * Backport drm_unlocked_ioctl_flag_present changes from 470.239.06 to fix
+    kernel module build for Linux 6.8.
+  * Backport screen_info changes from 470.182.03 and 470.239.06 to fix kernel
+    module build for Linux 6.7 on arm64.
+  * New Romanian (ro) debconf translations by Remus-Gabriel Chelu.
+  * xserver-xorg-video-nvidia: Recommend nvidia-vulkan-icd.
+  * Move the libnvidia-glvkspirv dependency to libnvidia-(e)glcore.
+    (Cf. #1064194)
+  * Bump Standards-Version to 4.7.0. No changes needed.
+
+ -- Andreas Beckmann <anbe@debian.org>  Tue, 21 May 2024 10:58:38 +0200
+
 nvidia-graphics-drivers (450.248.02-4) UNRELEASED; urgency=medium
 
   * The Tesla 450 driver series has been declared as End-of-Life by
@@ -1198,7 +1245,7 @@ nvidia-graphics-drivers (450.248.02-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (450.248.02-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 450.248.02 (2023-06-26).
+  * New upstream Tesla branch release 450.248.02 (2023-06-26).
     * Fixed CVE-2023-25515, CVE-2023-25516.  (Closes: #1039682)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5468
     * Improved compatibility with recent Linux kernels.
@@ -1224,7 +1271,7 @@ nvidia-graphics-drivers (450.236.01-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (450.236.01-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 450.236.01 (2023-03-30).
+  * New upstream Tesla branch release 450.236.01 (2023-03-30).
     * Fixed CVE-2023-0184, CVE-2023-0189, CVE-2023-0180, CVE-2023-0185,
       CVE-2023-0198, CVE-2023-0199, CVE-2023-0188, CVE-2023-0190,
       CVE-2023-0194, CVE-2023-0195, CVE-2023-0191.  (Closes: #1033778)
@@ -1247,7 +1294,7 @@ nvidia-graphics-drivers (450.236.01-1) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (450.216.04-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 450.216.04 (2022-11-22).
+  * New upstream Tesla branch release 450.216.04 (2022-11-22).
     * Fixed CVE-2022-34670, CVE-2022-34674, CVE-2022-34675, CVE-2022-34677,
       CVE-2022-34679, CVE-2022-34680, CVE-2022-34682, CVE-2022-42254,
       CVE-2022-42256, CVE-2022-42257, CVE-2022-42258, CVE-2022-42259,
@@ -1257,7 +1304,7 @@ nvidia-graphics-drivers (450.216.04-1) UNRELEASED; urgency=medium
     - Improved performance on GPUs which are experiencing a high number
       of correctable ECC memory errors.
     * Improved compatibility with recent Linux kernels.
-  * New upstream Tesla release (amd64 only) 450.203.08 (2022-10-19).
+  * New upstream Tesla branch release (amd64 only) 450.203.08 (2022-10-19).
 
   [ Andreas Beckmann ]
   * Refresh patches.
@@ -1279,7 +1326,7 @@ nvidia-graphics-drivers (450.203.03-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (450.203.03-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 450.203.03 (2022-08-02).
+  * New upstream Tesla branch release 450.203.03 (2022-08-02).
     * Fixed CVE-2022-31607, CVE-2022-31608, CVE-2022-31615. (Closes: #1016618)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5383
     * Improved compatibility with recent Linux kernels.
@@ -1311,7 +1358,7 @@ nvidia-graphics-drivers (450.191.01-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (450.191.01-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 450.191.01 (2022-05-16).
+  * New upstream Tesla branch release 450.191.01 (2022-05-16).
     * Fixed CVE-2022-28181, CVE-2022-28185, CVE-2022-28192. (Closes: #1011144)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5353
 
@@ -1345,7 +1392,7 @@ nvidia-graphics-drivers (450.172.01-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (450.172.01-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 450.172.01 (2022-01-31).
+  * New upstream Tesla branch release 450.172.01 (2022-01-31).
     * Fixed CVE-2022-21813, CVE-2022-21814.  (Closes: #1004851)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5312
     - Fixed a bug that caused nvidia-drm.ko to crash when loading with
@@ -1363,7 +1410,7 @@ nvidia-graphics-drivers (450.172.01-1) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (450.156.00-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 450.156.00 (2021-10-26).
+  * New upstream Tesla branch release 450.156.00 (2021-10-26).
     - Fixed a bug that could cause the /proc/driver/nvidia/suspend power
       management interface to fail to preserve and restore video memory
       allocations when the NVreg_TemporaryFilePath module parameter for
@@ -1395,7 +1442,7 @@ nvidia-graphics-drivers (450.142.00-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (450.142.00-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 450.142.00 (2021-07-20).
+  * New upstream Tesla branch release 450.142.00 (2021-07-20).
     * Fixed CVE-2021-1093, CVE-2021-1094, CVE-2021-1095.  (Closes: #991356)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5211
     - Fixed a bug that could result in blank displays when driving multiple
@@ -1414,13 +1461,13 @@ nvidia-graphics-drivers (450.142.00-1) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (450.119.04-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 450.119.04 (2021-05-04).
+  * New upstream Tesla branch release 450.119.04 (2021-05-04).
 
  -- Andreas Beckmann <anbe@debian.org>  Thu, 20 May 2021 13:53:07 +0200
 
 nvidia-graphics-drivers (450.119.03-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 450.119.03 (2021-04-19).
+  * New upstream production and Tesla branch release 450.119.03 (2021-04-19).
     * Fixed CVE-2021-1076, CVE-2021-1077.  (Closes: #987221)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5172
     - Fixed a driver installation failure on Linux kernel 5.11 release
@@ -1447,7 +1494,7 @@ nvidia-graphics-drivers (450.102.04-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (450.102.04-1) UNRELEASED; urgency=medium
 
-  * New upstream long lived branch release 450.102.04 (2021-01-07).
+  * New upstream long lived and Tesla branch release 450.102.04 (2021-01-07).
     * Fixed CVE-2021-1052, CVE-2021-1053, CVE-2021-1056.  (Closes: #979675)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5142
     - Fixed the X driver's composition pipeline (used, e.g., for X desktop
@@ -1487,7 +1534,7 @@ nvidia-graphics-drivers (450.80.02-2) unstable; urgency=medium
 
 nvidia-graphics-drivers (450.80.02-1) unstable; urgency=medium
 
-  * New upstream long lived branch release 450.80.02 (2020-09-30).
+  * New upstream long lived and Tesla branch release 450.80.02 (2020-09-30).
     - Added support for the following GPUs: A100-PCIE-40GB,
       A100 Graphics Device, DGX Display, GeForce MX450.
     * Improved compatibility with recent Linux kernels.
@@ -1574,7 +1621,7 @@ nvidia-graphics-drivers (450.51.06-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (450.51.06-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 450.51.06 (2020-07-28).
+  * New upstream Tesla branch release 450.51.06 (2020-07-28).
 
   [ Andreas Beckmann ]
   * Allow alternative libnvidia-{tesla,legacy}-*-cfg1 packages to substitute
@@ -1589,7 +1636,7 @@ nvidia-graphics-drivers (450.51.06-1) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (450.51.05-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 450.51.05 (2020-07-07).
+  * New upstream Tesla branch release 450.51.05 (2020-07-07).
 
  -- Andreas Beckmann <anbe@debian.org>  Fri, 17 Jul 2020 17:50:32 +0200
 
@@ -1733,7 +1780,7 @@ nvidia-graphics-drivers (440.118.02-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (440.118.02-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 440.118.02 (2020-09-30).
+  * New upstream Tesla branch release 440.118.02 (2020-09-30).
     - Fixed a bug that could cause the X server to crash when using large
       cursor images with PRIME display offloading.
     - Fixed a bug where a Vulkan application under PRIME render
@@ -1795,7 +1842,7 @@ nvidia-graphics-drivers (440.95.01-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (440.95.01-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 440.95.01 (2020-06-24).
+  * New upstream Tesla branch release 440.95.01 (2020-06-24).
     * Fixed CVE-2020-5963, CVE-2020-5967.  (Closes: #963766)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5031
     - Added support for the following GPUs: GeForce GTX 1650 Ti,
@@ -1844,7 +1891,7 @@ nvidia-graphics-drivers (440.82-1) unstable; urgency=medium
 
 nvidia-graphics-drivers (440.64.00-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 440.64.00 (2020-03-10).
+  * New upstream Tesla branch release 440.64.00 (2020-03-10).
 
   [ Andreas Beckmann ]
   * Update lintian overrides.
@@ -1932,7 +1979,7 @@ nvidia-graphics-drivers (440.36-1) experimental; urgency=medium
   * New upstream long lived branch release 440.36 (2019-11-22).
     - Fixed graphical corruption that can occur when using
       glslang SPIR-V Generator Version <= 2.
-  * New upstream Tesla release 440.33.01 (2019-11-19).
+  * New upstream Tesla branch release 440.33.01 (2019-11-19).
 
   [ Andreas Beckmann ]
   * Update symbols files.
@@ -2241,6 +2288,18 @@ nvidia-graphics-drivers (430.14-1) experimental; urgency=medium
 
  -- Andreas Beckmann <anbe@debian.org>  Sat, 25 May 2019 13:49:09 +0200
 
+nvidia-graphics-drivers (418.226.00-14) UNRELEASED; urgency=medium
+
+  * Backport drm_unlocked_ioctl_flag_present changes from 470.239.06 to fix
+    kernel module build for Linux 6.8.
+  * New Romanian (ro) debconf translations by Remus-Gabriel Chelu.
+  * xserver-xorg-video-nvidia: Recommend nvidia-vulkan-icd.
+  * Move the libnvidia-glvkspirv dependency to libnvidia-(e)glcore.
+    (Cf. #1064194)
+  * Bump Standards-Version to 4.7.0. No changes needed.
+
+ -- Andreas Beckmann <anbe@debian.org>  Mon, 20 May 2024 23:57:56 +0200
+
 nvidia-graphics-drivers (418.226.00-13) UNRELEASED; urgency=medium
 
   * Revert backport of pin_user_pages changes.
@@ -2389,7 +2448,7 @@ nvidia-graphics-drivers (418.226.00-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (418.226.00-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 418.226.00 (2021-10-26).
+  * New upstream Tesla branch release 418.226.00 (2021-10-26).
 
   [ Andreas Beckmann ]
   * bug-script: Show the nvidia and glx alternatives (470.82.00-1).
@@ -2414,7 +2473,7 @@ nvidia-graphics-drivers (418.211.00-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (418.211.00-1) buster; urgency=medium
 
-  * New upstream Tesla release 418.211.00 (2021-07-20).
+  * New upstream Tesla branch release 418.211.00 (2021-07-20).
     * Fixed CVE-2021-1093, CVE-2021-1094, CVE-2021-1095.  (Closes: #991351)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5211
 
@@ -2432,7 +2491,7 @@ nvidia-graphics-drivers (418.211.00-1) buster; urgency=medium
 
 nvidia-graphics-drivers (418.197.02-1) buster; urgency=medium
 
-  * New upstream Tesla release 418.197.02 (2021-04-19).
+  * New upstream Tesla branch release 418.197.02 (2021-04-19).
     * Fixed CVE-2021-1076.  (Closes: #987216)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5172
 
@@ -2454,7 +2513,7 @@ nvidia-graphics-drivers (418.181.07-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (418.181.07-1) buster; urgency=medium
 
-  * New upstream Tesla release 418.181.07 (2021-01-19).
+  * New upstream Tesla branch release 418.181.07 (2021-01-19).
     * Fixed CVE-2021-1056.  (Closes: #979670)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5142
     * Improved compatibility with recent Linux kernels.
@@ -2490,7 +2549,7 @@ nvidia-graphics-drivers (418.165.02-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (418.165.02-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 418.165.02 (2020-09-30).
+  * New upstream Tesla branch release 418.165.02 (2020-09-30).
 
   [ Andreas Beckmann ]
   * Backport get_user_pages_remote, vga_tryget, smp_read_barrier_depends,
@@ -2525,7 +2584,7 @@ nvidia-graphics-drivers (418.152.00-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (418.152.00-1) buster; urgency=medium
 
-  * New upstream Tesla release 418.152.00 (2020-06-24).
+  * New upstream Tesla branch release 418.152.00 (2020-06-24).
     * Fixed CVE-2020-5963, CVE-2020-5967.  (Closes: #963766)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5031
 
@@ -2569,7 +2628,7 @@ nvidia-graphics-drivers (418.126.02-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (418.126.02-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 418.126.02 (2020-02-28).
+  * New upstream Tesla branch release 418.126.02 (2020-02-28).
     - Added support for the following GPU: Quadro T2000 with Max-Q Design.
 
  -- Andreas Beckmann <anbe@debian.org>  Mon, 16 Mar 2020 10:59:07 +0100
@@ -2586,7 +2645,7 @@ nvidia-graphics-drivers (418.116.00-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (418.116.00-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 418.116.00 (2019-12-09).
+  * New upstream Tesla branch release 418.116.00 (2019-12-09).
 
   [ Andreas Beckmann ]
   * Allow alternative libnvidia-{tesla,legacy}-*-cuda1 packages to substitute
@@ -2674,8 +2733,8 @@ nvidia-graphics-drivers (418.87.01-2) UNRELEASED; urgency=medium
 
 nvidia-graphics-drivers (418.87.01-1) UNRELEASED; urgency=medium
 
-  * New upstream Tesla release 418.87.01 (2019-10-03).
-  * New upstream Tesla release 418.87.00 (2019-08-13).
+  * New upstream Tesla branch release 418.87.01 (2019-10-03).
+  * New upstream Tesla branch release 418.87.00 (2019-08-13).
     - Added support for the following GPUs: Quadro P520, Quadro RTX 3000,
       Quadro RTX 3000 with Max-Q Design, Quadro RTX 4000 with Max-Q Design,
       Quadro RTX 5000 with Max-Q Design, Quadro T1000, Quadro T2000.
@@ -2699,6 +2758,7 @@ nvidia-graphics-drivers (418.74-1) unstable; urgency=medium
     - Added support for the following GPUs: Quadro P2200, GeForce GTX 1650,
       GeForce GTX 1650 with Max-Q Design,
       GeForce GTX 1660 Ti with Max-Q Design.
+  * New upstream Tesla branch release 418.67 (2019-05-07).
 
   [ Andreas Beckmann ]
   * Update nv-readme.ids.
@@ -2747,6 +2807,7 @@ nvidia-graphics-drivers (418.43-1) experimental; urgency=medium
       Vulkan titles. This bug was particularly prevalent on DXVK titles.
     - Fixed a bug that caused vkCmdPushConstants to generate Xid 13 messages
       when executed with VK_SHADER_STAGE_ALL on a compute queue.
+  * New upstream Tesla branch release 418.40.04 (2019-03-25).
   * New upstream beta 418.30 (2019-01-30).
     - Added initial support for G-SYNC Compatible monitors.  See the README
       for details.
@@ -2879,6 +2940,12 @@ nvidia-graphics-drivers (415.27-1) experimental; urgency=medium
 
  -- Andreas Beckmann <anbe@debian.org>  Mon, 11 Feb 2019 21:53:12 +0100
 
+nvidia-graphics-drivers (410.129-1) unstable; urgency=medium
+
+  * New upstream Tesla branch release 410.129 (2019-09-04).
+
+ -- Andreas Beckmann <anbe@debian.org>  Thu, 05 Sep 2019 00:00:00 +0100
+
 nvidia-graphics-drivers (410.104-3) unstable; urgency=medium
 
   * [i386 armhf]: Reinstate nvidia-smi as a transitional package depending on
@@ -2899,7 +2966,7 @@ nvidia-graphics-drivers (410.104-2) unstable; urgency=medium
 
 nvidia-graphics-drivers (410.104-1) unstable; urgency=medium
 
-  * New upstream long lived branch release 410.104 (2019-02-22).
+  * New upstream long lived and Tesla branch release 410.104 (2019-02-22).
     * Fixed CVE-2018-6260.  (Closes: #913467)
       https://nvidia.custhelp.com/app/answers/detail/a_id/4772
     - Added support for the following GPU: Tesla V100-SXM3-32GB-H.
@@ -2928,6 +2995,7 @@ nvidia-graphics-drivers (410.93-1) experimental; urgency=medium
     - Fixed a bug that could prevent display detection from working on
       displays connected to some notebook docking stations.
     - Added support for the following GPU: Quadro RTX 8000.
+  * New upstream Tesla branch release 410.79 (2018-12-03).
 
   [ Andreas Beckmann ]
   * Merge changes from 390.87-6.
@@ -2947,6 +3015,7 @@ nvidia-graphics-drivers (410.78-1) experimental; urgency=medium
       legacy VGA mode when using a DisplayPort Multi-Stream link.
     - Added support for the following GPUs: Quadro RTX 4000, Tesla T4.
   * New upstream long lived branch release 410.73 (2018-10-25).
+  * New upstream Tesla branch release 410.72 (2018-10-29).
   * New upstream long lived branch release 410.66 (2018-10-16).
     - Added a USB-C display connector type identifier, such that a display
       connected using Turing's USB-C connector will be named, e.g., "USB-C-0"
@@ -3124,6 +3193,13 @@ nvidia-graphics-drivers (396.18-1) experimental; urgency=medium
 
  -- Andreas Beckmann <anbe@debian.org>  Sun, 22 Apr 2018 13:59:45 +0200
 
+nvidia-graphics-drivers (390.157-7) UNRELEASED; urgency=medium
+
+  * Backport drm_unlocked_ioctl_flag_present changes from 470.239.06 to fix
+    kernel module build for Linux 6.8.
+
+ -- Andreas Beckmann <anbe@debian.org>  Mon, 20 May 2024 14:46:16 +0200
+
 nvidia-graphics-drivers (390.157-6) UNRELEASED; urgency=medium
 
   * Revert backport of pin_user_pages changes.
@@ -5275,7 +5351,8 @@ nvidia-graphics-drivers (355.11-2) experimental; urgency=medium
 
 nvidia-graphics-drivers (355.11-1) experimental; urgency=medium
 
-  * New upstream release 355.11 (2015-08-31). (Closes: #804547)
+  * New upstream short lived branch release 355.11 (2015-08-31).
+    (Closes: #804547)
     - Fixed a bug that could cause GPU exceptions when using glReadPixels()
       on the depth or stencil buffers of multisample windows while resizing
       or moving the windows.
@@ -5587,7 +5664,8 @@ nvidia-graphics-drivers (352.41-1) experimental; urgency=medium
 
 nvidia-graphics-drivers (352.30-1) experimental; urgency=medium
 
-  * New upstream release 352.30 (2015-07-28). (Closes: #794075)
+  * New upstream long lived branch release 352.30 (2015-07-28).
+    (Closes: #794075)
     - Fixed a bug that caused poor video post-processing performance
       in VDPAU when operating on a large number of video streams
       simultaneously.
@@ -5621,7 +5699,8 @@ nvidia-graphics-drivers (352.21-2) experimental; urgency=medium
 
 nvidia-graphics-drivers (352.21-1) experimental; urgency=medium
 
-  * New upstream release 352.21 (2015-06-15). (Closes: #793079)
+  * New upstream long lived branch release 352.21 (2015-06-15).
+    (Closes: #793079)
     - Fixed a bug that caused the kernel to report errors when unmapping
       DMA allocations on kernels with CONFIG_DEBUG_DMA_API enabled.
     - Added GLX Protocol support for the following OpenGL extensions:
@@ -5683,7 +5762,7 @@ nvidia-graphics-drivers (349.16-2) unstable; urgency=medium
 
 nvidia-graphics-drivers (349.16-1) unstable; urgency=low
 
-  * New upstream short-lived branch release 349.16 (2015-04-14).
+  * New upstream short lived branch release 349.16 (2015-04-14).
   * New upstream beta 349.12 (2015-03-25).
     - Added support for G-SYNC monitors when used together with non-G-SYNC
       monitors.  When G-SYNC is enabled, non-G-SYNC monitors will display with
@@ -5723,14 +5802,14 @@ nvidia-graphics-drivers (349.16-1) unstable; urgency=low
 
 nvidia-graphics-drivers (346.96-1) unstable; urgency=low
 
-  * New upstream release 346.96 (2015-09-01).  (Closes: #811349)
+  * New upstream long lived branch release 346.96 (2015-09-01).  (Closes: #811349)
     * Fixed CVE-2015-5950: Memory corruption due to an unsanitized pointer.
       https://nvidia.custhelp.com/app/answers/detail/a_id/3763
       (Closes: #800566)
     - Added support for the following GPU: Tesla K80.
-  * New upstream release 346.87 (2015-07-21).
+  * New upstream long lived branch release 346.87 (2015-07-21).
     - Added support for the following GPU: GeForce 910M.
-  * New upstream release 346.82 (2015-06-23).
+  * New upstream long lived branch release 346.82 (2015-06-23).
     - Added support for the following GPUs: Tesla K40t, GeForce 720A,
       GeForce 920A, GeForce 930A, GeForce 940A, GeForce GTX 950A,
       GeForce GTX 980 Ti.
@@ -5750,7 +5829,7 @@ nvidia-graphics-drivers (346.96-1) unstable; urgency=low
 
 nvidia-graphics-drivers (346.72-1) experimental; urgency=medium
 
-  * New upstream release 346.72 (2015-05-12).
+  * New upstream long lived branch release 346.72 (2015-05-12).
     - Added support for the following GPU: GeForce GPU.
     - Fixed a bug causing loss of stereo synchronization in certain Quadro
       Sync framelock configurations.
@@ -5773,7 +5852,7 @@ nvidia-graphics-drivers (346.72-1) experimental; urgency=medium
 
 nvidia-graphics-drivers (346.59-1) experimental; urgency=medium
 
-  * New upstream release 346.59 (2015-04-07).  (Closes: #775742)
+  * New upstream long lived branch release 346.59 (2015-04-07).  (Closes: #775742)
     - Fixed a bug that caused corruption when switching display modes in some
       applications that use transform feedback.
     - Added support for the following GPUs: Quadro K1200, Quadro M6000,
@@ -5783,7 +5862,7 @@ nvidia-graphics-drivers (346.59-1) experimental; urgency=medium
       attachments cleared using glClearTexImage().
     - Fixed a bug that artificially limited the maximum pixel clock on
       displays in some SLI Mosaic configurations.
-  * New upstream release 346.47 (2015-02-24).
+  * New upstream long lived branch release 346.47 (2015-02-24).
     - Fixed a bug that could cause quad-buffered stereo applications to
       crash when disabling displays.
     - Fixed a bug that could cause rendering corruption in GLX clients using
@@ -5797,7 +5876,7 @@ nvidia-graphics-drivers (346.59-1) experimental; urgency=medium
       GeForce GTX 960, GeForce GTX 965M.
     - Fixed a bug that caused DisplayPort audio to stop working after monitors
       are hotplugged.
-  * New upstream release 346.35 (2015-01-16).
+  * New upstream long lived branch release 346.35 (2015-01-16).
     - Added support for the following GPUs: GeForce 800A, GeForce 800M.
     - Updated the NVIDIA X driver to reject frame packed interlaced HDMI 3D
       modes during mode validation. These modes were being validated by the
@@ -7718,7 +7797,7 @@ nvidia-graphics-drivers (313.18-2) experimental; urgency=low
 
 nvidia-graphics-drivers (313.18-1) experimental; urgency=low
 
-  * New upstream release 313.18 (2013-01-15).
+  * New upstream short lived branch release 313.18 (2013-01-15).
     - Added support in NV-CONTROL and in nvidia-settings for changing the
       Double Precision performance boost mode on supported GPUs.
     - Fixed several OpenGL driver bugs related to stencil-only framebuffer
@@ -7826,7 +7905,7 @@ nvidia-graphics-drivers (310.40-1) UNRELEASED; urgency=low
 
 nvidia-graphics-drivers (310.19-1) experimental; urgency=low
 
-  * New upstream release 310.19 (2012-11-13).
+  * New upstream long lived branch release 310.19 (2012-11-13).
   * Merge changes from 304.64-4.
   * Drop kernel-3.7.patch, fixed upstream.
   * Fix debian/module/debian/kernel-version to cope with $KSRC/linux/version.h
@@ -8736,7 +8815,7 @@ nvidia-graphics-drivers (302.17-2) unstable; urgency=low
 
 nvidia-graphics-drivers (302.17-1) experimental; urgency=low
 
-  * New upstream release 302.17 (2012-06-15).
+  * New upstream short lived branch release 302.17 (2012-06-15).
     - Made nvidiaXineramaInfoOrder consistent with the RRSetOutputPrimary
       and RRGetOutputPrimary RandR requests: changes to either
       nvidiaXineramaInfoOrder or RandR OutputPrimary will be reflected in
diff --git a/debian/control b/debian/control
index 38b0ac78e..25adec0ef 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends:
  linux-headers-powerpc64le [ppc64el] <!nocheck>,
  libglvnd-dev,
 Rules-Requires-Root: no
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Homepage: https://www.nvidia.com
 Testsuite: autopkgtest-pkg-dkms
 XS-Autobuild: yes
@@ -204,6 +204,7 @@ Depends:
 Recommends:
  ${nvidia}-driver (>= ${nvidia:Version}),
  ${nvidia}-vdpau-driver (>= ${nvidia:Version}),
+ ${nvidia}-vulkan-icd (>= ${nvidia:Version}),
  ${nvidia:kmod:binary},
  ${nvidia-settings},
 Suggests:
@@ -362,6 +363,7 @@ Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends}
 Depends:
+ lib${nvidia}-glvkspirv (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Provides:
  libnvidia-glcore-${nvidia:Version},
@@ -451,6 +453,7 @@ Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends}
 Depends:
+ lib${nvidia}-glvkspirv (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Provides:
  libnvidia-eglcore-${nvidia:Version},
@@ -565,7 +568,6 @@ Depends:
  nvidia-vulkan-common,
  libvulkan1 (>= 1.0.42),
  libglx-${nvidia-}0 (= ${binary:Version}),
- lib${nvidia}-glvkspirv (= ${binary:Version}),
  ${misc:Depends}
 Recommends:
  lib${nvidia}-cbl (= ${binary:Version}) [!i386 !ppc64el],
diff --git a/debian/control.in b/debian/control.in
index 43f5244ba..69a05d68f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -22,7 +22,7 @@ Build-Depends:
  linux-headers-powerpc64le [ppc64el] <!nocheck>,
  libglvnd-dev,
 Rules-Requires-Root: no
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Homepage: https://www.nvidia.com
 Testsuite: autopkgtest-pkg-dkms
 XS-Autobuild: yes
@@ -203,6 +203,7 @@ Depends:
 Recommends:
  ${nvidia}-driver (>= ${nvidia:Version}),
  ${nvidia}-vdpau-driver (>= ${nvidia:Version}),
+ ${nvidia}-vulkan-icd (>= ${nvidia:Version}),
  ${nvidia:kmod:binary},
  ${nvidia-settings},
 Suggests:
@@ -439,6 +440,7 @@ Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends}
 Depends:
+ lib${nvidia}-glvkspirv (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Provides:
  libnvidia-glcore-${nvidia:Version},
@@ -606,6 +608,7 @@ Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends}
 Depends:
+ lib${nvidia}-glvkspirv (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Provides:
  libnvidia-eglcore-${nvidia:Version},
@@ -720,7 +723,6 @@ Depends:
  nvidia-vulkan-common,
  libvulkan1 (>= 1.0.42),
  libglx-${nvidia-}0 (= ${binary:Version}),
- lib${nvidia}-glvkspirv (= ${binary:Version}),
  ${misc:Depends}
 Recommends:
  lib${nvidia}-cbl (= ${binary:Version}) [!i386 !ppc64el],
diff --git a/debian/control.md5sum b/debian/control.md5sum
index 9fdc85fd2..bd28e166f 100644
--- a/debian/control.md5sum
+++ b/debian/control.md5sum
@@ -1,5 +1,5 @@
-9245eb440284c742e298837dd1ef5710  debian/control
-8b6f7805d559e39e303fc8a1ca98f118  debian/control.in
+c1fcde21258897e911228d34edf2863e  debian/control
+ba39c4b9cb7355b8b90d44d4a151cf80  debian/control.in
 8489c83cfe0171c9de6d052c01a6d19b  debian/gen-control.pl
 512c3a349bdf347cf839113f7592843f  debian/rules
-ba8cb91ffa763b6c1ad9a59d37d6603a  debian/rules.defs
+4b13b2ee07a759c017148425ecfd1aa2  debian/rules.defs
diff --git a/debian/module/debian/patches/0026-add-missing-includes-to-fix-module-build-for-ppc64el.patch b/debian/module/debian/patches/0026-add-missing-includes-to-fix-module-build-for-ppc64el.patch
deleted file mode 100644
index e6243f3dc..000000000
--- a/debian/module/debian/patches/0026-add-missing-includes-to-fix-module-build-for-ppc64el.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5d5ba8c3cf58a9fea414e23041d5dcca0916d258 Mon Sep 17 00:00:00 2001
-From: Andreas Beckmann <anbe@debian.org>
-Date: Sun, 20 Nov 2022 05:18:47 +0100
-Subject: [PATCH] add missing #includes to fix module build for ppc64el
-
----
- nvidia/nvlink_common.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/nvidia/nvlink_common.h b/nvidia/nvlink_common.h
-index 1543d6f..6aa1ef3 100644
---- a/nvidia/nvlink_common.h
-+++ b/nvidia/nvlink_common.h
-@@ -28,6 +28,13 @@
- extern "C" {
- #endif
- 
-+#if defined(NV_ASM_PROM_H_PRESENT)
-+#if defined(NV_LINUX_OF_H_PRESENT)
-+#include <linux/of.h>
-+#endif
-+#include <asm/prom.h>
-+#endif
-+
- #include "nvtypes.h"
- #include "nvCpuUuid.h"
- #include "nvlink_errors.h"
--- 
-2.20.1
-
diff --git a/debian/module/debian/patches/0033-refuse-to-load-legacy-module-if-IBT-is-enabled.patch b/debian/module/debian/patches/0033-refuse-to-load-legacy-module-if-IBT-is-enabled.patch
index fdf164a33..8381960ba 100644
--- a/debian/module/debian/patches/0033-refuse-to-load-legacy-module-if-IBT-is-enabled.patch
+++ b/debian/module/debian/patches/0033-refuse-to-load-legacy-module-if-IBT-is-enabled.patch
@@ -1,4 +1,4 @@
-From 4cbf69d932c2802dd52bb6f3036909d3c46861e5 Mon Sep 17 00:00:00 2001
+From 142c8a9c82eac6bc920e01976b63e860ed0dc305 Mon Sep 17 00:00:00 2001
 From: Andreas Beckmann <anbe@debian.org>
 Date: Sat, 4 Nov 2023 00:44:56 +0100
 Subject: [PATCH] refuse to load legacy module if IBT is enabled
@@ -23,10 +23,10 @@ https://bugs.debian.org/1052069
  2 files changed, 14 insertions(+)
 
 diff --git a/nvidia-modeset/nvidia-modeset-linux.c b/nvidia-modeset/nvidia-modeset-linux.c
-index 04a8ac4..b0a3443 100644
+index de0c748..e9c8eab 100644
 --- a/nvidia-modeset/nvidia-modeset-linux.c
 +++ b/nvidia-modeset/nvidia-modeset-linux.c
-@@ -1651,6 +1651,13 @@ static int __init nvkms_init(void)
+@@ -1655,6 +1655,13 @@ static int __init nvkms_init(void)
  {
      int ret;
  
@@ -41,10 +41,10 @@ index 04a8ac4..b0a3443 100644
  
      ret = nvkms_alloc_rm();
 diff --git a/nvidia/nv.c b/nvidia/nv.c
-index 42778da..7f57503 100644
+index 9d7da39..14e8f1d 100644
 --- a/nvidia/nv.c
 +++ b/nvidia/nv.c
-@@ -739,6 +739,13 @@ int __init nvidia_init_module(void)
+@@ -743,6 +743,13 @@ int __init nvidia_init_module(void)
      nvidia_stack_t *sp = NULL;
      NvU32 allow_no_gpu_init = 0;
  
diff --git a/debian/module/debian/patches/0034-fix-typos.patch b/debian/module/debian/patches/0034-fix-typos.patch
index 0423ba3be..5034ae204 100644
--- a/debian/module/debian/patches/0034-fix-typos.patch
+++ b/debian/module/debian/patches/0034-fix-typos.patch
@@ -1,4 +1,4 @@
-From 62b4f377c5212c427a1de6254ac73b5092ee0f4d Mon Sep 17 00:00:00 2001
+From fb925ec1f579e10abb7000553155431510301f78 Mon Sep 17 00:00:00 2001
 From: Andreas Beckmann <anbe@debian.org>
 Date: Wed, 31 Jan 2024 03:06:19 +0100
 Subject: [PATCH] fix typos
@@ -6,7 +6,8 @@ Subject: [PATCH] fix typos
 ---
  nvidia-uvm/uvm.h                | 2 +-
  nvidia-uvm/uvm_perf_thrashing.c | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ nvidia/nv.c                     | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/nvidia-uvm/uvm.h b/nvidia-uvm/uvm.h
 index 85c2a58..3401901 100644
@@ -43,6 +44,19 @@ index 00add34..13025dd 100644
      if (g_uvm_global.num_simulated_devices > 0 &&
          (g_uvm_perf_thrashing_lapse_usec == UVM_PERF_THRASHING_LAPSE_USEC_DEFAULT)) {
          va_space_thrashing->params.lapse_ns  = UVM_PERF_THRASHING_LAPSE_USEC_DEFAULT_EMULATION * 1000;
+diff --git a/nvidia/nv.c b/nvidia/nv.c
+index 14e8f1d..182d1af 100644
+--- a/nvidia/nv.c
++++ b/nvidia/nv.c
+@@ -4531,7 +4531,7 @@ NvU64 NV_API_CALL nv_get_dma_start_address(
+      * Otherwise, the DMA start address only needs to be set once, and it
+      * won't change afterward. Just return the cached value if asked again,
+      * to avoid the kernel printing redundant messages to the kernel
+-     * log when we call pci_set_dma_mask().
++     * log when we call dma_set_mask().
+      */
+     if ((nv_tce_bypass_mode == NV_TCE_BYPASS_MODE_DISABLE) ||
+         (nvl->tce_bypass_enabled))
 -- 
 2.20.1
 
diff --git a/debian/module/debian/patches/conftest-verbose.patch b/debian/module/debian/patches/conftest-verbose.patch
index 8fbecb4a6..f79fc31ad 100644
--- a/debian/module/debian/patches/conftest-verbose.patch
+++ b/debian/module/debian/patches/conftest-verbose.patch
@@ -3,7 +3,7 @@ Description: dump the generated conftest headers
 
 --- a/Kbuild
 +++ b/Kbuild
-@@ -126,6 +126,16 @@ NV_CONFTEST_HEADERS += $(obj)/conftest/h
+@@ -130,6 +130,16 @@ NV_CONFTEST_HEADERS += $(obj)/conftest/h
  NV_CONFTEST_HEADERS += $(NV_CONFTEST_COMPILE_TEST_HEADERS)
  
  
@@ -20,7 +20,7 @@ Description: dump the generated conftest headers
  #
  # Generate a header file for a single conftest compile test. Each compile test
  # header depends on conftest.sh, as well as the generated conftest/headers.h
-@@ -150,6 +160,8 @@ define NV_GENERATE_COMPILE_TEST_HEADER
+@@ -154,6 +164,8 @@ define NV_GENERATE_COMPILE_TEST_HEADER
  	@mkdir -p $(obj)/conftest
  	@# concatenate /dev/null to prevent cat from hanging when $$^ is empty
  	@cat $$^ /dev/null > $$@
@@ -29,7 +29,7 @@ Description: dump the generated conftest headers
  endef
  
  #
-@@ -169,9 +181,11 @@ $(eval $(call NV_GENERATE_COMPILE_TEST_H
+@@ -173,9 +185,11 @@ $(eval $(call NV_GENERATE_COMPILE_TEST_H
  $(eval $(call NV_GENERATE_COMPILE_TEST_HEADER,symbols,$(NV_CONFTEST_SYMBOL_COMPILE_TESTS)))
  $(eval $(call NV_GENERATE_COMPILE_TEST_HEADER,types,$(NV_CONFTEST_TYPE_COMPILE_TESTS)))
  
@@ -42,7 +42,7 @@ Description: dump the generated conftest headers
  
  
  # Each of these headers is checked for presence with a test #include; a
-@@ -252,8 +266,9 @@ NV_HEADER_PRESENCE_PART = $(addprefix $(
+@@ -256,8 +270,9 @@ NV_HEADER_PRESENCE_PART = $(addprefix $(
  
  # Define a rule to check the header $(1).
  define NV_HEADER_PRESENCE_CHECK
@@ -53,7 +53,7 @@ Description: dump the generated conftest headers
  	@$$(NV_CONFTEST_CMD) test_kernel_header '$$(NV_CONFTEST_CFLAGS)' '$(1)' > $$@
  endef
  
-@@ -263,6 +278,8 @@ $(foreach header,$(NV_HEADER_PRESENCE_TE
+@@ -267,6 +282,8 @@ $(foreach header,$(NV_HEADER_PRESENCE_TE
  # Concatenate all of the parts into headers.h.
  $(obj)/conftest/headers.h: $(call NV_HEADER_PRESENCE_PART,$(NV_HEADER_PRESENCE_TESTS))
  	@cat $^ > $@
@@ -62,7 +62,7 @@ Description: dump the generated conftest headers
  
  clean-dirs := $(obj)/conftest
  
-@@ -283,7 +300,8 @@ BUILD_SANITY_CHECKS = \
+@@ -287,7 +304,8 @@ BUILD_SANITY_CHECKS = \
  
  .PHONY: $(BUILD_SANITY_CHECKS)
  
diff --git a/debian/module/debian/patches/series.in b/debian/module/debian/patches/series.in
index af892c86b..3d094678c 100644
--- a/debian/module/debian/patches/series.in
+++ b/debian/module/debian/patches/series.in
@@ -3,7 +3,6 @@ bashisms.patch
 
 # kernel support
 0001-some-power-management-features-were-not-yet-in-Linux.patch
-0026-add-missing-includes-to-fix-module-build-for-ppc64el.patch
 0033-refuse-to-load-legacy-module-if-IBT-is-enabled.patch
 0034-fix-typos.patch
 
diff --git a/debian/module/debian/patches/use-kbuild-flags.patch b/debian/module/debian/patches/use-kbuild-flags.patch
index 3bbfd1e4b..6c676f5cb 100644
--- a/debian/module/debian/patches/use-kbuild-flags.patch
+++ b/debian/module/debian/patches/use-kbuild-flags.patch
@@ -13,16 +13,20 @@ Description: use KBUILD_CFLAGS and (KBUILD_)LDFLAGS
 
 --- a/Kbuild
 +++ b/Kbuild
-@@ -108,6 +108,12 @@ NV_CONFTEST_CMD := /bin/sh $(NV_CONFTEST
+@@ -108,6 +108,16 @@ NV_CONFTEST_CMD := /bin/sh $(NV_CONFTEST
  NV_CFLAGS_FROM_CONFTEST := $(shell $(NV_CONFTEST_CMD) build_cflags)
  
  NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(EXTRA_CFLAGS) -fno-pie
 +NV_CONFTEST_CFLAGS += \
 +	$(patsubst -DARM64_ASM_ARCH=%,-DARM64_ASM_ARCH="%",\
-+	$(filter-out -Werror% $(GCC_PLUGINS_CFLAGS),\
++	$(filter-out $(GCC_PLUGINS_CFLAGS),\
 +	$(KBUILD_CFLAGS)\
 +	)\
 +	)
++NV_CONFTEST_CFLAGS += $(call cc-option,-Wno-error=implicit-function-declaration,)
++NV_CONFTEST_CFLAGS += $(call cc-option,-Wno-error=incompatible-pointer-types,)
++NV_CONFTEST_CFLAGS += $(call cc-option,-Wno-error=return-type,)
++NV_CONFTEST_CFLAGS += $(call cc-option,-Wno-error=strict-prototypes,)
  
  NV_CONFTEST_COMPILE_TEST_HEADERS := $(obj)/conftest/macros.h
  NV_CONFTEST_COMPILE_TEST_HEADERS += $(obj)/conftest/functions.h
diff --git a/debian/rules.defs b/debian/rules.defs
index 58602c9db..cf5333283 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -9,7 +9,7 @@ NVIDIA_LEGACY_CHECK	 = nvidia-legacy-check (>= 396) [amd64]
 XORG_ABI_LIST		 = 25 24 23 20 19 18 15 14 13 12 11 10 8 6.0
 XORG_BOUND		 = (<< 2:21.99)
 
-LINUX_KMOD_TESTED	 = 6.7
+LINUX_KMOD_TESTED	 = 6.8
 
 ARCH_LIST		 = amd64
 ARCH_LIST		+= i386
