diff --git a/debian/changelog b/debian/changelog
index ffd7efa34..065d4de5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+nvidia-graphics-drivers (535.261.03-1) bookworm; urgency=medium
+
+  * New upstream LTS and Tesla branch release 535.261.03 (2025-07-17).
+    * Fixed CVE-2025-23279, CVE-2025-23286.  (Closes: #1109907)
+      https://nvidia.custhelp.com/app/answers/detail/a_id/5670
+    - Fixed a bug that could cause 32-bit x86 applications running on
+      recent builds of glibc to crash on dlopen().
+    - Fixed an issue that could cause render-offloaded applications using
+      KDE Frameworks 6 to crash.
+    * Improved compatibility with recent Linux kernels.
+
+  [ Andreas Beckmann ]
+  * Refresh patches.
+
+ -- Andreas Beckmann <anbe@debian.org>  Sun, 17 Aug 2025 14:22:36 +0200
+
+nvidia-graphics-drivers (535.247.01-2) UNRELEASED; urgency=medium
+
+  [ Andreas Beckmann ]
+  * Backport drm_connector_helper_funcs_mode_valid_has_const_mode_arg changes
+    from 550.163.01 and ccflags-y, nv_timer_delete_sync, __iowrite64_lo_hi,
+    page_pgmap and make_device_exclusive changes from 570.153.02 and
+    nv_vma_start_write changes from 570.169 to fix kernel module build for
+    Linux 6.15.
+
+  [ Luca Boccassi ]
+  * Remove myself from Uploaders.
+
+ -- Andreas Beckmann <anbe@debian.org>  Sat, 19 Jul 2025 21:46:11 +0200
+
 nvidia-graphics-drivers (535.247.01-1~deb12u1) bookworm; urgency=medium
 
   * Rebuild for bookworm.
@@ -19,9 +49,15 @@ nvidia-graphics-drivers (535.247.01-1) unstable; urgency=medium
 nvidia-graphics-drivers (535.230.02-1) unstable; urgency=medium
 
   * New upstream LTS and Tesla branch release 535.230.02 (2025-01-16).
-    * Fixed CVE-2024-0150, CVE-2024-0147, CVE-2024-53869, CVE-2024-0131,
-      CVE-2024-0149.  (Closes: #1093908)
+    * Fixed CVE-2024-0150, CVE-2024-0147, CVE-2024-0131, CVE-2024-0149.
+      (Closes: #1093908)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5614
+    - Updated the kernel module build process to use CONFIG_CC_VERSION_TEXT
+      from the Linux kernel's Kconfig to detect the compiler used to build
+      the kernel. This may help select the correct compiler on systems where
+      the kernel was built with a compiler other than the default one.
+    - Fixed a bug that prevented kernel modules linked using precompiled
+      kernel interface files from loading on recent Debian systems.
     * Drop ppc64le driver.
     * Improved compatibility with recent Linux kernels.
 
@@ -85,6 +121,20 @@ nvidia-graphics-drivers (535.216.01-1) unstable; urgency=medium
   * New upstream LTS and Tesla branch release 535.216.01 (2024-10-22).
     * Fixed CVE-2024-0126.  (Closes: #1085968)
       https://nvidia.custhelp.com/app/answers/detail/a_id/5586
+    - In linux-next commit 446d0f4849b1, intended to be included in Linux
+      kernel 6.12, output_poll_changed is removed from struct
+      drm_mode_config_funcs. Do not implement the function pointer member
+      when not present to ensure the driver can compile with newer kernels.
+      Populating modes for DRM connectors during hotplug events will not be
+      supported with r535 and kernels containing the relevant commit.
+    - Fixed a bug that caused the nvidia-powerd service to fail on some
+      ADA notebooks with the error message "Error in getting the NvPCF
+      static configuration".
+    - Fixed a bug that could cause external displays to become frozen until
+      the next modeset when using PRIME Display Offloading with the NVIDIA
+      dGPU acting as the display offload sink.
+    - Fixed a bug that caused OpenGL triple buffering to behave like double
+      buffering.
     * Improved compatibility with recent Linux kernels.
 
   [ Andreas Beckmann ]
@@ -137,6 +187,15 @@ nvidia-graphics-drivers (535.183.01-1) unstable; urgency=medium
     - Fixed a bug that could cause additional X screens to claim displays
       that should have been assigned to a prior X screen based on the given X
       configuration.
+
+  [ Andreas Beckmann ]
+  * Refresh patches.
+  * Update nv-readme.ids.
+
+ -- Andreas Beckmann <anbe@debian.org>  Fri, 14 Jun 2024 11:20:01 +0200
+
+nvidia-graphics-drivers (535.179-1) UNRELEASED; urgency=medium
+
   * New upstream long term support branch release 535.179 (2024-05-09).
   * New upstream long term support branch release 535.171.04 (2024-03-21).
     - Fixed Xid error when playing Alan Wake 2 with ray tracing enabled.
@@ -148,7 +207,7 @@ nvidia-graphics-drivers (535.183.01-1) unstable; urgency=medium
   * Refresh patches.
   * Update nv-readme.ids.
 
- -- Andreas Beckmann <anbe@debian.org>  Fri, 14 Jun 2024 11:20:01 +0200
+ -- Andreas Beckmann <anbe@debian.org>  Tue, 14 May 2024 09:03:28 +0200
 
 nvidia-graphics-drivers (535.161.08-3) unstable; urgency=medium
 
@@ -465,6 +524,22 @@ nvidia-graphics-drivers (530.30.02-1) experimental; urgency=medium
 
  -- Andreas Beckmann <anbe@debian.org>  Mon, 13 Mar 2023 23:48:29 +0100
 
+nvidia-graphics-drivers (525.147.05-17) UNRELEASED; urgency=medium
+
+  [ Luca Boccassi ]
+  * Remove myself from Uploaders.
+
+ -- Andreas Beckmann <anbe@debian.org>  Sun, 20 Jul 2025 17:35:28 +0200
+
+nvidia-graphics-drivers (525.147.05-16) UNRELEASED; urgency=medium
+
+  * Backport drm_connector_helper_funcs_mode_valid_has_const_mode_arg changes
+    from 550.163.01 and ccflags-y and nv_timer_delete_sync changes from
+    570.153.02 and nv_vma_start_write changes from 570.169 to fix kernel
+    module build for Linux 6.15.
+
+ -- Andreas Beckmann <anbe@debian.org>  Mon, 23 Jun 2025 09:53:50 +0200
+
 nvidia-graphics-drivers (525.147.05-14) UNRELEASED; urgency=medium
 
   * Backport drm_driver_has_date changes from 570.124.04 to fix kernel module
@@ -1332,6 +1407,22 @@ nvidia-graphics-drivers (495.44-1) experimental; urgency=medium
 
  -- Andreas Beckmann <anbe@debian.org>  Fri, 05 Nov 2021 10:45:12 +0100
 
+nvidia-graphics-drivers (470.256.02-8) UNRELEASED; urgency=medium
+
+  [ Luca Boccassi ]
+  * Remove myself from Uploaders.
+
+ -- Andreas Beckmann <anbe@debian.org>  Sun, 20 Jul 2025 17:30:24 +0200
+
+nvidia-graphics-drivers (470.256.02-7) UNRELEASED; urgency=medium
+
+  * Backport drm_connector_helper_funcs_mode_valid_has_const_mode_arg changes
+    from 550.163.01 and ccflags-y and nv_timer_delete_sync changes from
+    570.153.02 and nv_vma_start_write changes from 570.169 to fix kernel
+    module build for Linux 6.15.
+
+ -- Andreas Beckmann <anbe@debian.org>  Mon, 23 Jun 2025 02:49:53 +0200
+
 nvidia-graphics-drivers (470.256.02-6) UNRELEASED; urgency=medium
 
   * Backport drm_driver_has_date changes from 570.124.04 to fix kernel module
@@ -1396,6 +1487,8 @@ nvidia-graphics-drivers (470.256.02-1) bullseye; urgency=medium
     - 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.
+    - Fixed a bug that caused driver build failure when using separate
+      kernel source and output directories on Linux v6.6 and later.
 
   [ Andreas Beckmann ]
   * Refresh patches.
@@ -2069,6 +2162,26 @@ 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-22) UNRELEASED; urgency=medium
+
+  [ Andreas Beckmann ]
+  * Backport nv_vma_start_write changes from 570.169.
+
+  [ Luca Boccassi ]
+  * Remove myself from Uploaders.
+
+ -- Andreas Beckmann <anbe@debian.org>  Sun, 20 Jul 2025 17:21:59 +0200
+
+nvidia-graphics-drivers (460.106.00-21) UNRELEASED; urgency=medium
+
+  * Backport ccflags-y and nv_timer_delete_sync changes from 570.153.02 and
+    drm_connector_helper_funcs_mode_valid_has_const_mode_arg changes from
+    550.163.01 and import tentative fix from CachyOS for avoiding calls to
+    GPL-only symbol __vma_start_write to fix kernel module build for
+    Linux 6.15.
+
+ -- Andreas Beckmann <anbe@debian.org>  Wed, 18 Jun 2025 23:44:24 +0200
+
 nvidia-graphics-drivers (460.106.00-20) UNRELEASED; urgency=medium
 
   * Backport drm_driver_has_date changes from 570.124.04 to fix kernel module
@@ -2642,6 +2755,26 @@ 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-12) UNRELEASED; urgency=medium
+
+  [ Andreas Beckmann ]
+  * Backport nv_vma_start_write changes from 570.169.
+
+  [ Luca Boccassi ]
+  * Remove myself from Uploaders.
+
+ -- Andreas Beckmann <anbe@debian.org>  Sun, 20 Jul 2025 17:13:55 +0200
+
+nvidia-graphics-drivers (450.248.02-11) UNRELEASED; urgency=medium
+
+  * Backport ccflags-y and nv_timer_delete_sync changes from 570.153.02 and
+    drm_connector_helper_funcs_mode_valid_has_const_mode_arg changes from
+    550.163.01 and import tentative fix from CachyOS for avoiding calls to
+    GPL-only symbol __vma_start_write to fix kernel module build for
+    Linux 6.15.
+
+ -- Andreas Beckmann <anbe@debian.org>  Wed, 18 Jun 2025 22:30:15 +0200
+
 nvidia-graphics-drivers (450.248.02-10) UNRELEASED; urgency=medium
 
   * Backport drm_driver_has_date changes from 570.124.04 to fix kernel module
@@ -3776,6 +3909,26 @@ 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-20) UNRELEASED; urgency=medium
+
+  [ Andreas Beckmann ]
+  * Backport nv_vma_start_write changes from 570.169.
+
+  [ Luca Boccassi ]
+  * Remove myself from Uploaders.
+
+ -- Andreas Beckmann <anbe@debian.org>  Fri, 20 Jun 2025 00:52:30 +0200
+
+nvidia-graphics-drivers (418.226.00-19) UNRELEASED; urgency=medium
+
+  * Backport ccflags-y and nv_timer_delete_sync changes from 570.153.02 and
+    drm_connector_helper_funcs_mode_valid_has_const_mode_arg changes from
+    550.163.01 and import tentative fix from CachyOS for avoiding calls to
+    GPL-only symbol __vma_start_write to fix kernel module build for
+    Linux 6.15.
+
+ -- Andreas Beckmann <anbe@debian.org>  Wed, 18 Jun 2025 17:21:29 +0200
+
 nvidia-graphics-drivers (418.226.00-18) UNRELEASED; urgency=medium
 
   * Backport drm_driver_has_date changes from 570.124.04 to fix kernel module
@@ -4724,6 +4877,26 @@ 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-14) UNRELEASED; urgency=medium
+
+  [ Andreas Beckmann ]
+  * Backport nv_vma_start_write changes from 570.169.
+
+  [ Luca Boccassi ]
+  * Remove myself from Uploaders.
+
+ -- Andreas Beckmann <anbe@debian.org>  Fri, 20 Jun 2025 00:25:32 +0200
+
+nvidia-graphics-drivers (390.157-13) UNRELEASED; urgency=medium
+
+  * Backport ccflags-y and nv_timer_delete_sync changes from 570.153.02 and
+    drm_connector_helper_funcs_mode_valid_has_const_mode_arg changes from
+    550.163.01 and import tentative fix from CachyOS for avoiding calls to
+    GPL-only symbol __vma_start_write to fix kernel module build for
+    Linux 6.15.  (Closes: #1107817)
+
+ -- Andreas Beckmann <anbe@debian.org>  Wed, 18 Jun 2025 11:18:35 +0200
+
 nvidia-graphics-drivers (390.157-12) UNRELEASED; urgency=medium
 
   * Backport drm_driver_has_date changes from 570.124.04 to fix kernel module
@@ -7668,6 +7841,10 @@ nvidia-graphics-drivers (343.22-1) experimental; urgency=medium
 
 nvidia-graphics-drivers (340.108-2) UNRELEASED; urgency=medium
 
+  * Backport ccflags-y and nv_timer_delete_sync changes from 570.153.02 and
+    nv_vma_start_write changes from 570.169 to fix kernel module build for
+    Linux 6.15.
+
   * Backport drm_driver_has_date changes from 570.124.04 to fix kernel module
     build for Linux 6.14.
 
diff --git a/debian/control b/debian/control
index dea0cda7c..58fd95e32 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Priority: optional
 Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel@lists.alioth.debian.org>
 Uploaders:
  Andreas Beckmann <anbe@debian.org>,
- Luca Boccassi <bluca@debian.org>,
 Vcs-Browser: https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers
 Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers.git -b 535
 Homepage: https://www.nvidia.com
@@ -89,9 +88,9 @@ Depends:
  lib${nvidia}-api1 (= ${binary:Version}),
  ${nvidia}-opencl-icd (= ${binary:Version}),
  nvidia-powerd [amd64],
- nvidia-cuda-mps [!ppc64el],
+ nvidia-cuda-mps,
  nvidia-suspend-common,
- nvidia-detect [!ppc64el],
+ nvidia-detect,
  ${nvidia-settings},
  nvidia-persistenced,
  ${misc:Depends}
diff --git a/debian/control.in b/debian/control.in
index 57fbce22e..14bababfa 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel@lists.alioth.debian.org>
 Uploaders:
  Andreas Beckmann <anbe@debian.org>,
- Luca Boccassi <bluca@debian.org>,
 Vcs-Browser: https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers
 Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers.git${Vcs-Git:Branch}
 Homepage: https://www.nvidia.com
@@ -88,9 +87,9 @@ Depends:
  lib${nvidia}-api1 (= ${binary:Version}),
  ${nvidia}-opencl-icd (= ${binary:Version}),
  nvidia-powerd [amd64],
- nvidia-cuda-mps [!ppc64el],
+ nvidia-cuda-mps,
  nvidia-suspend-common,
- nvidia-detect [!ppc64el],
+ nvidia-detect,
  ${nvidia-settings},
  nvidia-persistenced,
  ${misc:Depends}
diff --git a/debian/control.md5sum b/debian/control.md5sum
index bc7eb3ca1..fc3a50745 100644
--- a/debian/control.md5sum
+++ b/debian/control.md5sum
@@ -1,5 +1,5 @@
-1ac782447419fd218f86bd98b81bdbd3  debian/control
-c8dc18045ca0cc1224e2e3e5dcb8164e  debian/control.in
+7ac47cd55e24ee952999f4bcf12defda  debian/control
+c05034b43deabddf017e6dacd6e69a6f  debian/control.in
 8489c83cfe0171c9de6d052c01a6d19b  debian/gen-control.pl
 edf87fc3e75d36637927cd4358266ae1  debian/rules
-6f4012a154fc16693a2c2a43a292ca78  debian/rules.defs
+bc2262adfa9ea3040e894a6fbe5ea2d2  debian/rules.defs
diff --git a/debian/patches/module/0002-conftest.sh-remove-empty-lines-from-uts_release-outp.patch b/debian/patches/module/0002-conftest.sh-remove-empty-lines-from-uts_release-outp.patch
index 5cf62f9a4..b5fe78cba 100644
--- a/debian/patches/module/0002-conftest.sh-remove-empty-lines-from-uts_release-outp.patch
+++ b/debian/patches/module/0002-conftest.sh-remove-empty-lines-from-uts_release-outp.patch
@@ -1,4 +1,4 @@
-From 575dab59a98c0c6938124763f1d08052c922e159 Mon Sep 17 00:00:00 2001
+From c273e7506268be0ca9810464f2c98f19f9fd5f3a Mon Sep 17 00:00:00 2001
 From: Andreas Beckmann <anbe@debian.org>
 Date: Mon, 31 Oct 2022 14:40:42 +0100
 Subject: [PATCH] conftest.sh: remove empty lines from uts_release output
@@ -8,10 +8,10 @@ Subject: [PATCH] conftest.sh: remove empty lines from uts_release output
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/conftest.sh b/conftest.sh
-index 60277da8..70a3d5af 100755
+index 79baf185..012bc0dc 100755
 --- a/conftest.sh
 +++ b/conftest.sh
-@@ -5985,7 +5985,7 @@ compile_test() {
+@@ -5958,7 +5958,7 @@ compile_test() {
              echo "#include <generated/utsrelease.h>
              UTS_RELEASE" > conftest$$.c
  
diff --git a/debian/patches/module/0052-backport-uvm-warning-fixes-from-560.28.03.patch b/debian/patches/module/0052-backport-uvm-warning-fixes-from-560.28.03.patch
index 51de674a0..ecf78381d 100644
--- a/debian/patches/module/0052-backport-uvm-warning-fixes-from-560.28.03.patch
+++ b/debian/patches/module/0052-backport-uvm-warning-fixes-from-560.28.03.patch
@@ -1,4 +1,4 @@
-From 4cad785a66fe11ea3c70e8436b159bdf4dd84608 Mon Sep 17 00:00:00 2001
+From 801c9ef5360863c1a0b9cca59cd0525b9375816e Mon Sep 17 00:00:00 2001
 From: Andreas Beckmann <anbe@debian.org>
 Date: Sun, 8 Dec 2024 22:54:59 +0100
 Subject: [PATCH] backport uvm warning fixes from 560.28.03
@@ -16,7 +16,8 @@ Subject: [PATCH] backport uvm warning fixes from 560.28.03
  nvidia-uvm/uvm_pmm_sysmem_test.c     |  7 +++++--
  nvidia-uvm/uvm_pmm_test.c            | 10 +++++-----
  nvidia-uvm/uvm_populate_pageable.c   |  2 +-
- 12 files changed, 26 insertions(+), 23 deletions(-)
+ nvidia-uvm/uvm_tools.c               |  1 +
+ 13 files changed, 27 insertions(+), 23 deletions(-)
 
 diff --git a/nvidia-uvm/uvm_channel_test.c b/nvidia-uvm/uvm_channel_test.c
 index c4521d22..f3cfd494 100644
@@ -252,6 +253,18 @@ index 9c90032e..9e96471a 100644
  {
      NV_STATUS status = NV_OK;
  
+diff --git a/nvidia-uvm/uvm_tools.c b/nvidia-uvm/uvm_tools.c
+index 3619a7ce..7b81a54a 100644
+--- a/nvidia-uvm/uvm_tools.c
++++ b/nvidia-uvm/uvm_tools.c
+@@ -25,6 +25,7 @@
+ #include "uvm_gpu.h"
+ #include "uvm_hal.h"
+ #include "uvm_tools.h"
++#include "uvm_tools_init.h"
+ #include "uvm_va_space.h"
+ #include "uvm_api.h"
+ #include "uvm_hal_types.h"
 -- 
 2.39.5
 
diff --git a/debian/patches/module/0053-fix-more-warnings.patch b/debian/patches/module/0053-fix-more-warnings.patch
index 1c1500bd4..666d27537 100644
--- a/debian/patches/module/0053-fix-more-warnings.patch
+++ b/debian/patches/module/0053-fix-more-warnings.patch
@@ -5,11 +5,9 @@ Subject: [PATCH] fix more warnings
 
 ---
  common/inc/nv-linux.h | 8 ++++++++
- common/inc/nv-proto.h | 2 +-
- nvidia/libspdm_aead.c | 2 ++
  nvidia/nv-frontend.c  | 2 --
  nvidia/nv-frontend.h  | 3 +++
- 5 files changed, 14 insertions(+), 3 deletions(-)
+ 3 files changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/common/inc/nv-linux.h b/common/inc/nv-linux.h
 index 433e5587..54b2ce17 100644
@@ -53,39 +51,6 @@ index 433e5587..54b2ce17 100644
      }
  
  #define NV_KFREE(ptr, size) \
-diff --git a/common/inc/nv-proto.h b/common/inc/nv-proto.h
-index 815107d2..b016e42e 100644
---- a/common/inc/nv-proto.h
-+++ b/common/inc/nv-proto.h
-@@ -43,7 +43,7 @@ void        nv_procfs_remove_gpu        (nv_linux_state_t *);
- 
- int         nvidia_mmap                 (struct file *, struct vm_area_struct *);
- int         nvidia_mmap_helper          (nv_state_t *, nv_linux_file_private_t *, nvidia_stack_t *, struct vm_area_struct *, void *);
--int         nv_encode_caching           (pgprot_t *, NvU32, NvU32);
-+int         nv_encode_caching           (pgprot_t *, NvU32, nv_memory_type_t);
- void        nv_revoke_gpu_mappings_locked(nv_state_t *);
- 
- NvUPtr      nv_vm_map_pages             (struct page **, NvU32, NvBool, NvBool);
-diff --git a/nvidia/libspdm_aead.c b/nvidia/libspdm_aead.c
-index 3844da48..18d23ba2 100644
---- a/nvidia/libspdm_aead.c
-+++ b/nvidia/libspdm_aead.c
-@@ -38,6 +38,7 @@ struct lkca_aead_ctx
- };
- #endif
- 
-+static
- int libspdm_aead_prealloc(void **context, char const *alg)
- {
- #ifndef USE_LKCA
-@@ -168,6 +169,7 @@ static int lkca_aead_internal(struct crypto_aead *aead,
- }
- #endif
- 
-+static
- int libspdm_aead_prealloced(void *context,
-                             const uint8_t *key, size_t key_size,
-                             const uint8_t *iv, size_t iv_size,
 diff --git a/nvidia/nv-frontend.c b/nvidia/nv-frontend.c
 index eb7a2e08..0bdbe02a 100644
 --- a/nvidia/nv-frontend.c
diff --git a/debian/patches/module/0054-backport-warning-fixes-from-575.51.02.patch b/debian/patches/module/0054-backport-warning-fixes-from-575.51.02.patch
new file mode 100644
index 000000000..ed371c257
--- /dev/null
+++ b/debian/patches/module/0054-backport-warning-fixes-from-575.51.02.patch
@@ -0,0 +1,75 @@
+From a6e092742f84c41fb94d700bcd4a1c7b247134fd Mon Sep 17 00:00:00 2001
+From: Andreas Beckmann <anbe@debian.org>
+Date: Tue, 27 May 2025 17:50:15 +0200
+Subject: [PATCH] backport warning fixes from 575.51.02
+
+---
+ common/inc/nv-proto.h                |  2 +-
+ nvidia-uvm/uvm_gpu_access_counters.c |  1 +
+ nvidia/libspdm_aead.c                | 18 +++++++++---------
+ 3 files changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/common/inc/nv-proto.h b/common/inc/nv-proto.h
+index 815107d2..b016e42e 100644
+--- a/common/inc/nv-proto.h
++++ b/common/inc/nv-proto.h
+@@ -43,7 +43,7 @@ void        nv_procfs_remove_gpu        (nv_linux_state_t *);
+ 
+ int         nvidia_mmap                 (struct file *, struct vm_area_struct *);
+ int         nvidia_mmap_helper          (nv_state_t *, nv_linux_file_private_t *, nvidia_stack_t *, struct vm_area_struct *, void *);
+-int         nv_encode_caching           (pgprot_t *, NvU32, NvU32);
++int         nv_encode_caching           (pgprot_t *, NvU32, nv_memory_type_t);
+ void        nv_revoke_gpu_mappings_locked(nv_state_t *);
+ 
+ NvUPtr      nv_vm_map_pages             (struct page **, NvU32, NvBool, NvBool);
+diff --git a/nvidia-uvm/uvm_gpu_access_counters.c b/nvidia-uvm/uvm_gpu_access_counters.c
+index 77512d6d..d042f63d 100644
+--- a/nvidia-uvm/uvm_gpu_access_counters.c
++++ b/nvidia-uvm/uvm_gpu_access_counters.c
+@@ -24,6 +24,7 @@
+ #include "nv_uvm_interface.h"
+ #include "uvm_gpu_access_counters.h"
+ #include "uvm_global.h"
++#include "uvm_api.h"
+ #include "uvm_gpu.h"
+ #include "uvm_hal.h"
+ #include "uvm_kvmalloc.h"
+diff --git a/nvidia/libspdm_aead.c b/nvidia/libspdm_aead.c
+index 3844da48..6ff5adeb 100644
+--- a/nvidia/libspdm_aead.c
++++ b/nvidia/libspdm_aead.c
+@@ -38,7 +38,7 @@ struct lkca_aead_ctx
+ };
+ #endif
+ 
+-int libspdm_aead_prealloc(void **context, char const *alg)
++static int libspdm_aead_prealloc(void **context, char const *alg)
+ {
+ #ifndef USE_LKCA
+     return -ENODEV;
+@@ -168,14 +168,14 @@ static int lkca_aead_internal(struct crypto_aead *aead,
+ }
+ #endif
+ 
+-int libspdm_aead_prealloced(void *context,
+-                            const uint8_t *key, size_t key_size,
+-                            const uint8_t *iv, size_t iv_size,
+-                            const uint8_t *a_data, size_t a_data_size,
+-                            const uint8_t *data_in, size_t data_in_size,
+-                            uint8_t *tag, size_t tag_size,
+-                            uint8_t *data_out, size_t *data_out_size,
+-                            bool enc)
++static int libspdm_aead_prealloced(void *context,
++                                   const uint8_t *key, size_t key_size,
++                                   const uint8_t *iv, size_t iv_size,
++                                   const uint8_t *a_data, size_t a_data_size,
++                                   const uint8_t *data_in, size_t data_in_size,
++                                   uint8_t *tag, size_t tag_size,
++                                   uint8_t *data_out, size_t *data_out_size,
++                                   bool enc)
+ {
+ #ifndef USE_LKCA
+     return -ENODEV;
+-- 
+2.39.5
+
diff --git a/debian/patches/module/0054-fix-more-uvm-warnings.patch b/debian/patches/module/0054-fix-more-uvm-warnings.patch
index e76063110..e5db851e3 100644
--- a/debian/patches/module/0054-fix-more-uvm-warnings.patch
+++ b/debian/patches/module/0054-fix-more-uvm-warnings.patch
@@ -4,9 +4,8 @@ Date: Tue, 10 Dec 2024 20:08:50 +0100
 Subject: [PATCH] fix more uvm warnings
 
 ---
- nvidia-uvm/uvm_gpu.c   | 1 +
- nvidia-uvm/uvm_tools.c | 1 +
- 2 files changed, 2 insertions(+)
+ nvidia-uvm/uvm_gpu.c | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/nvidia-uvm/uvm_gpu.c b/nvidia-uvm/uvm_gpu.c
 index 9070f444..f7874a9e 100644
@@ -20,18 +19,6 @@ index 9070f444..f7874a9e 100644
  uvm_gpu_t *uvm_gpu_get_by_parent_and_swizz_id_locked(uvm_parent_gpu_t *parent_gpu, NvU32 swizz_id)
  {
      uvm_gpu_t *gpu;
-diff --git a/nvidia-uvm/uvm_tools.c b/nvidia-uvm/uvm_tools.c
-index 3619a7ce..569c454b 100644
---- a/nvidia-uvm/uvm_tools.c
-+++ b/nvidia-uvm/uvm_tools.c
-@@ -35,6 +35,7 @@
- #include "uvm_range_group.h"
- #include "uvm_mem.h"
- #include "nv_speculation_barrier.h"
-+#include "uvm_tools_init.h"
- 
- // We limit the number of times a page can be retained by the kernel
- // to prevent the user from maliciously passing UVM tools the same page
 -- 
 2.39.5
 
diff --git a/debian/patches/module/0060-backport-module_import_ns_takes_string_literal-chang.patch b/debian/patches/module/0060-backport-module_import_ns_takes_string_literal-chang.patch
index cddc948b4..9edd89f40 100644
--- a/debian/patches/module/0060-backport-module_import_ns_takes_string_literal-chang.patch
+++ b/debian/patches/module/0060-backport-module_import_ns_takes_string_literal-chang.patch
@@ -1,4 +1,4 @@
-From a46fa4405ec31fbf621696fd99e5dd6d200af156 Mon Sep 17 00:00:00 2001
+From e080e43c4f0ff8d861f29821b3a319a8933e49cd Mon Sep 17 00:00:00 2001
 From: Andreas Beckmann <anbe@debian.org>
 Date: Fri, 21 Feb 2025 10:21:42 +0100
 Subject: [PATCH] backport module_import_ns_takes_string_literal changes from
@@ -10,10 +10,10 @@ Subject: [PATCH] backport module_import_ns_takes_string_literal changes from
  2 files changed, 18 insertions(+)
 
 diff --git a/conftest.sh b/conftest.sh
-index 70a3d5af..bf61ef7b 100755
+index 012bc0dc..aae3b07a 100755
 --- a/conftest.sh
 +++ b/conftest.sh
-@@ -5517,6 +5517,23 @@ compile_test() {
+@@ -5490,6 +5490,23 @@ compile_test() {
              else
                  echo "#undef NV_OF_PROPERTY_READ_VARIABLE_U32_ARRAY_PRESENT" | append_conftest "functions"
              fi
@@ -38,10 +38,10 @@ index 70a3d5af..bf61ef7b 100755
  
          devm_of_platform_populate)
 diff --git a/nvidia/nvidia.Kbuild b/nvidia/nvidia.Kbuild
-index c88538fd..6a72a6c2 100644
+index 328324d3..22849337 100644
 --- a/nvidia/nvidia.Kbuild
 +++ b/nvidia/nvidia.Kbuild
-@@ -194,6 +194,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += get_task_ioprio
+@@ -193,6 +193,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += get_task_ioprio
  NV_CONFTEST_FUNCTION_COMPILE_TESTS += mdev_set_iommu_device
  NV_CONFTEST_FUNCTION_COMPILE_TESTS += offline_and_remove_memory
  NV_CONFTEST_FUNCTION_COMPILE_TESTS += crypto_tfm_ctx_aligned
diff --git a/debian/patches/module/0062-Support-BTF-generation-for-non-release-builds.patch b/debian/patches/module/0062-Support-BTF-generation-for-non-release-builds.patch
index 9fb5de7ff..c39a7fcb9 100644
--- a/debian/patches/module/0062-Support-BTF-generation-for-non-release-builds.patch
+++ b/debian/patches/module/0062-Support-BTF-generation-for-non-release-builds.patch
@@ -96,9 +96,7 @@ Example of limited kfuncs available from kernel module builds lacking BTF:
 
 Signed-off-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>
 
-Ignore c++11 in addition to c++.
-
-Origin: other, https://github.com/NVIDIA/open-gpu-kernel-modules/issues/756
+Bug: https://github.com/NVIDIA/open-gpu-kernel-modules/issues/756
 Origin: other, https://github.com/Binary-Eater/open-gpu-kernel-modules/commit/854449a7b76cdb4ad17919a1c8a662a4ff5b943d
 ---
  Makefile | 28 +++++++++++++++++++++++++++-
@@ -125,14 +123,14 @@ index 72672c2a..40a9792e 100644
 +  #     pahole_cmd = "pahole"
 +  #     for (i = 1; i < ARGC; i++) {
 +  #         if (ARGV[i] ~ /--lang_exclude=/) {
-+  #             pahole_cmd = pahole_cmd sprintf(" %s,c++,c++11", ARGV[i])
++  #             pahole_cmd = pahole_cmd sprintf(" %s,c++", ARGV[i])
 +  #         } else {
 +  #             pahole_cmd = pahole_cmd sprintf(" %s", ARGV[i])
 +  #         }
 +  #     }
 +  #     system(pahole_cmd)
 +  # }
-+  PAHOLE_AWK_PROGRAM = BEGIN { pahole_cmd = \"pahole\"; for (i = 1; i < ARGC; i++) { if (ARGV[i] ~ /--lang_exclude=/) { pahole_cmd = pahole_cmd sprintf(\" %s,c++,c++11\", ARGV[i]); } else { pahole_cmd = pahole_cmd sprintf(\" %s\", ARGV[i]); } } system(pahole_cmd); }
++  PAHOLE_AWK_PROGRAM = BEGIN { pahole_cmd = \"pahole\"; for (i = 1; i < ARGC; i++) { if (ARGV[i] ~ /--lang_exclude=/) { pahole_cmd = pahole_cmd sprintf(\" %s,c++\", ARGV[i]); } else { pahole_cmd = pahole_cmd sprintf(\" %s\", ARGV[i]); } } system(pahole_cmd); }
 +  # If scripts/pahole-flags.sh is not present in the kernel tree, add PAHOLE and
 +  # PAHOLE_AWK_PROGRAM assignments to PAHOLE_VARIABLES; otherwise assign the
 +  # empty string to PAHOLE_VARIABLES.
diff --git a/debian/patches/module/0062-let-pahole-ignore-c-11-in-addition-to-c.patch b/debian/patches/module/0062-let-pahole-ignore-c-11-in-addition-to-c.patch
new file mode 100644
index 000000000..4bd65da36
--- /dev/null
+++ b/debian/patches/module/0062-let-pahole-ignore-c-11-in-addition-to-c.patch
@@ -0,0 +1,34 @@
+From 6df42b1f5ac27cdd56517d4a1680809b682d1412 Mon Sep 17 00:00:00 2001
+From: Andreas Beckmann <anbe@debian.org>
+Date: Tue, 1 Apr 2025 14:47:51 +0200
+Subject: [PATCH] let pahole ignore c++11 in addition to c++
+
+Bug: https://github.com/NVIDIA/open-gpu-kernel-modules/issues/756#issuecomment-2769237410
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0a1394e0..40a9792e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -84,14 +84,14 @@ else
+   #     pahole_cmd = "pahole"
+   #     for (i = 1; i < ARGC; i++) {
+   #         if (ARGV[i] ~ /--lang_exclude=/) {
+-  #             pahole_cmd = pahole_cmd sprintf(" %s,c++", ARGV[i])
++  #             pahole_cmd = pahole_cmd sprintf(" %s,c++,c++11", ARGV[i])
+   #         } else {
+   #             pahole_cmd = pahole_cmd sprintf(" %s", ARGV[i])
+   #         }
+   #     }
+   #     system(pahole_cmd)
+   # }
+-  PAHOLE_AWK_PROGRAM = BEGIN { pahole_cmd = \"pahole\"; for (i = 1; i < ARGC; i++) { if (ARGV[i] ~ /--lang_exclude=/) { pahole_cmd = pahole_cmd sprintf(\" %s,c++\", ARGV[i]); } else { pahole_cmd = pahole_cmd sprintf(\" %s\", ARGV[i]); } } system(pahole_cmd); }
++  PAHOLE_AWK_PROGRAM = BEGIN { pahole_cmd = \"pahole\"; for (i = 1; i < ARGC; i++) { if (ARGV[i] ~ /--lang_exclude=/) { pahole_cmd = pahole_cmd sprintf(\" %s,c++,c++11\", ARGV[i]); } else { pahole_cmd = pahole_cmd sprintf(\" %s\", ARGV[i]); } } system(pahole_cmd); }
+   # If scripts/pahole-flags.sh is not present in the kernel tree, add PAHOLE and
+   # PAHOLE_AWK_PROGRAM assignments to PAHOLE_VARIABLES; otherwise assign the
+   # empty string to PAHOLE_VARIABLES.
+-- 
+2.39.5
+
diff --git a/debian/patches/module/bashisms.patch b/debian/patches/module/bashisms.patch
index 6274e0cf5..bb6dfa0db 100644
--- a/debian/patches/module/bashisms.patch
+++ b/debian/patches/module/bashisms.patch
@@ -3,7 +3,7 @@ Description: fix bashisms in conftest.sh
 
 --- a/conftest.sh
 +++ b/conftest.sh
-@@ -7023,7 +7023,7 @@ case "$5" in
+@@ -7039,7 +7039,7 @@ case "$5" in
  
          if [ -n "$VGX_BUILD" ]; then
              if [ -f /proc/xen/capabilities ]; then
diff --git a/debian/patches/module/cc_version_check-gcc5.patch b/debian/patches/module/cc_version_check-gcc5.patch
index 27abc9db1..dc8648bdd 100644
--- a/debian/patches/module/cc_version_check-gcc5.patch
+++ b/debian/patches/module/cc_version_check-gcc5.patch
@@ -5,7 +5,7 @@ Description: ignore __GNUC_MINOR__ from GCC 5 onwards
 
 --- a/conftest.sh
 +++ b/conftest.sh
-@@ -6857,7 +6857,7 @@ case "$5" in
+@@ -6873,7 +6873,7 @@ case "$5" in
          kernel_cc_minor=`echo ${kernel_cc_version} | cut -d '.' -f 2`
  
          echo "
diff --git a/debian/patches/module/conftest-verbose.patch b/debian/patches/module/conftest-verbose.patch
index ecd1841a7..dc231cc32 100644
--- a/debian/patches/module/conftest-verbose.patch
+++ b/debian/patches/module/conftest-verbose.patch
@@ -3,7 +3,7 @@ Description: dump the generated conftest headers
 
 --- a/Kbuild
 +++ b/Kbuild
-@@ -180,6 +180,17 @@ NV_CONFTEST_HEADERS += $(obj)/conftest/h
+@@ -175,6 +175,17 @@ NV_CONFTEST_HEADERS += $(obj)/conftest/h
  NV_CONFTEST_HEADERS += $(NV_CONFTEST_COMPILE_TEST_HEADERS)
  
  
@@ -21,7 +21,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
-@@ -204,6 +215,8 @@ define NV_GENERATE_COMPILE_TEST_HEADER
+@@ -199,6 +210,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 > $$@
@@ -30,7 +30,7 @@ Description: dump the generated conftest headers
  endef
  
  #
-@@ -223,9 +236,11 @@ $(eval $(call NV_GENERATE_COMPILE_TEST_H
+@@ -218,9 +231,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)))
  
@@ -43,7 +43,7 @@ Description: dump the generated conftest headers
  
  
  # Each of these headers is checked for presence with a test #include; a
-@@ -335,6 +350,7 @@ NV_HEADER_PRESENCE_PART = $(addprefix $(
+@@ -330,6 +345,7 @@ NV_HEADER_PRESENCE_PART = $(addprefix $(
  define NV_HEADER_PRESENCE_CHECK
   $$(call NV_HEADER_PRESENCE_PART,$(1)): $$(NV_CONFTEST_SCRIPT) $(obj)/conftest/uts_release
  	@mkdir -p $$(dir $$@)
@@ -51,7 +51,7 @@ Description: dump the generated conftest headers
  	@$$(NV_CONFTEST_CMD) test_kernel_header '$$(NV_CONFTEST_CFLAGS)' '$(1)' > $$@
  endef
  
-@@ -344,6 +360,8 @@ $(foreach header,$(NV_HEADER_PRESENCE_TE
+@@ -339,6 +355,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 $^ > $@
@@ -60,7 +60,7 @@ Description: dump the generated conftest headers
  
  clean-dirs := $(obj)/conftest
  
-@@ -364,7 +382,8 @@ BUILD_SANITY_CHECKS = \
+@@ -359,7 +377,8 @@ BUILD_SANITY_CHECKS = \
  
  .PHONY: $(BUILD_SANITY_CHECKS)
  
@@ -70,7 +70,7 @@ Description: dump the generated conftest headers
  	@$(NV_CONFTEST_CMD) $@ full_output
  
  # Perform all sanity checks before generating the conftest headers
-@@ -373,11 +392,13 @@ $(NV_CONFTEST_HEADERS): | $(BUILD_SANITY
+@@ -368,11 +387,13 @@ $(NV_CONFTEST_HEADERS): | $(BUILD_SANITY
  
  # Make the conftest headers depend on the kernel version string
  
diff --git a/debian/patches/module/series b/debian/patches/module/series
index 2e1a2d408..dc6401d43 100644
--- a/debian/patches/module/series
+++ b/debian/patches/module/series
@@ -9,11 +9,13 @@ bashisms.patch
 0046-backport-nv_get_kern_phys_address-changes-from-555.4.patch
 0052-backport-uvm-warning-fixes-from-560.28.03.patch
 0053-fix-more-warnings.patch
+0054-backport-warning-fixes-from-575.51.02.patch
 0054-fix-more-uvm-warnings.patch
 0058-backport-warning-fixes-from-565.57.01.patch
 0059-backport-uvm-warning-fixes-from-550.90.07.patch
 0060-backport-module_import_ns_takes_string_literal-chang.patch
 0062-Support-BTF-generation-for-non-release-builds.patch
+0062-let-pahole-ignore-c-11-in-addition-to-c.patch
 
 # build system updates
 conftest-verbose.patch
diff --git a/debian/patches/module/use-kbuild-compiler.patch b/debian/patches/module/use-kbuild-compiler.patch
index 248d4def0..064191a41 100644
--- a/debian/patches/module/use-kbuild-compiler.patch
+++ b/debian/patches/module/use-kbuild-compiler.patch
@@ -21,7 +21,7 @@ Description: let Kbuild set the compiler version
  	      ./split-object-file.sh $$module.ko; \
 --- a/Kbuild
 +++ b/Kbuild
-@@ -161,7 +161,7 @@ NV_CONFTEST_SCRIPT := $(src)/conftest.sh
+@@ -154,7 +154,7 @@ NV_CONFTEST_SCRIPT := $(src)/conftest.sh
  NV_CONFTEST_HEADER := $(obj)/conftest/headers.h
  
  NV_CONFTEST_CMD := /bin/sh $(NV_CONFTEST_SCRIPT) \
diff --git a/debian/patches/module/use-kbuild-flags.patch b/debian/patches/module/use-kbuild-flags.patch
index 9592e87b0..4dc3fa313 100644
--- a/debian/patches/module/use-kbuild-flags.patch
+++ b/debian/patches/module/use-kbuild-flags.patch
@@ -1,10 +1,6 @@
 Author: Andreas Beckmann <anbe@debian.org>
 Author: Tomas Janousek <tomi@nomi.cz>
 Description: use KBUILD_CFLAGS and (KBUILD_)LDFLAGS
- allows building a amd64 kernel module with i386 user space
- .
- skip -Werror=* since that breaks how conftest.sh detects stuff
- .
  skip $(GCC_PLUGINS_CFLAGS): fixes build failure when a kernel
  is built with CONFIG_GCC_PLUGINS, CONFIG_GCC_PLUGIN_STRUCTLEAK
  and CONFIG_GCC_PLUGIN_RANDSTRUCT -- Tomas Janousek
@@ -13,23 +9,33 @@ Description: use KBUILD_CFLAGS and (KBUILD_)LDFLAGS
 
 --- a/Kbuild
 +++ b/Kbuild
-@@ -168,6 +168,16 @@ NV_CFLAGS_FROM_CONFTEST := $(shell $(NV_
- NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(EXTRA_CFLAGS) -fno-pie
- NV_CONFTEST_CFLAGS += $(call cc-disable-warning,pointer-sign)
- NV_CONFTEST_CFLAGS += $(call cc-option,-fshort-wchar,)
-+NV_CONFTEST_CFLAGS += \
+@@ -150,6 +150,15 @@ endif
+ CC ?= cc
+ LD ?= ld
+ 
++NV_REMOVE_KBUILD_CFLAGS = $(GCC_PLUGINS_CFLAGS)
++
++NV_CFLAGS_FROM_KBUILD = \
 +	$(patsubst -DARM64_ASM_ARCH=%,-DARM64_ASM_ARCH="%",\
-+	$(filter-out $(GCC_PLUGINS_CFLAGS),\
++	$(filter-out $(NV_REMOVE_KBUILD_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_SCRIPT := $(src)/conftest.sh
+ NV_CONFTEST_HEADER := $(obj)/conftest/headers.h
  
- NV_CONFTEST_COMPILE_TEST_HEADERS := $(obj)/conftest/macros.h
- NV_CONFTEST_COMPILE_TEST_HEADERS += $(obj)/conftest/functions.h
+@@ -158,7 +167,9 @@ NV_CONFTEST_CMD := /bin/sh $(NV_CONFTEST
+ 
+ NV_CFLAGS_FROM_CONFTEST := $(shell $(NV_CONFTEST_CMD) build_cflags)
+ 
+-NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(ccflags-y) -fno-pie
++NV_CONFTEST_CFLAGS =
++NV_CONFTEST_CFLAGS += $(NV_CFLAGS_FROM_KBUILD)
++NV_CONFTEST_CFLAGS += $(NV_CFLAGS_FROM_CONFTEST) $(ccflags-y) -fno-pie
+ NV_CONFTEST_CFLAGS += $(filter -std=%,$(KBUILD_CFLAGS))
+ NV_CONFTEST_CFLAGS += $(call cc-disable-warning,pointer-sign)
+ NV_CONFTEST_CFLAGS += $(call cc-option,-fshort-wchar,)
 --- a/nvidia/nvidia.Kbuild
 +++ b/nvidia/nvidia.Kbuild
 @@ -100,7 +100,7 @@ always += $(NVIDIA_INTERFACE)
diff --git a/debian/rules.defs b/debian/rules.defs
index eea7017c6..fc5868259 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1,4 +1,4 @@
-TESLA_MAJOR		 = $(NVIDIA_MAJOR)
+#TESLA_MAJOR		 = $(NVIDIA_MAJOR)
 #NVIDIA_TESLA		 = $(TESLA_MAJOR)
 WATCH_VERSION		 = $(NVIDIA_MAJOR)
 
@@ -7,7 +7,7 @@ NVIDIA_LEGACY_CHECK	 = $${nvidia}-legacy-check (>= 495) [$${nvidia:archlist:driv
 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.14
+LINUX_KMOD_TESTED	 = 6.15
 
 ARCH_LIST		 = amd64
 ARCH_LIST		+= i386
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index db64088c0..9e93b1ab2 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -18,4 +18,4 @@ package-placeholder-in-symbols-file
 # only binary releases
 upstream-metadata-missing-repository
 very-long-line-length-in-source-file * > 512 [*/NVIDIA-Linux-*-*.run:*]
-unicode-trojan * [*/NVIDIA-Linux-*-*.run:*]
+#unicode-trojan * [*/NVIDIA-Linux-*-*.run:*]
