diff -Nru nvidia-graphics-drivers-515-server-515.86.01/debian/changelog nvidia-graphics-drivers-515-server-515.86.01/debian/changelog
--- nvidia-graphics-drivers-515-server-515.86.01/debian/changelog	2023-02-01 10:36:07.000000000 +0000
+++ nvidia-graphics-drivers-515-server-515.86.01/debian/changelog	2023-03-04 10:20:38.000000000 +0000
@@ -1,3 +1,12 @@
+nvidia-graphics-drivers-515-server (515.86.01-0ubuntu3) lunar; urgency=medium
+
+  * debian/dkms_nvidia/patches/buildfix_kernel_6.2.patch,
+    debian/templates/dkms_nvidia.conf.in,
+    debian/dkms_nvidia.conf:
+    - Add support for Linux 6.2 (LP: #2009255).
+
+ -- Andrea Righi <andrea.righi@canonical.com>  Sat, 04 Mar 2023 10:20:38 +0000
+
 nvidia-graphics-drivers-515-server (515.86.01-0ubuntu2) lunar; urgency=medium
 
   * debian/templates/control.in:
diff -Nru nvidia-graphics-drivers-515-server-515.86.01/debian/dkms_nvidia/patches/buildfix_kernel_6.2.patch nvidia-graphics-drivers-515-server-515.86.01/debian/dkms_nvidia/patches/buildfix_kernel_6.2.patch
--- nvidia-graphics-drivers-515-server-515.86.01/debian/dkms_nvidia/patches/buildfix_kernel_6.2.patch	1970-01-01 00:00:00.000000000 +0000
+++ nvidia-graphics-drivers-515-server-515.86.01/debian/dkms_nvidia/patches/buildfix_kernel_6.2.patch	2023-03-04 10:20:13.000000000 +0000
@@ -0,0 +1,70 @@
+--- a/nvidia-drm/nvidia-drm-connector.c	2023-03-04 08:32:31.663651988 +0000
++++ b/nvidia-drm/nvidia-drm-connector.c	2023-03-04 08:33:16.124316171 +0000
+@@ -30,6 +30,9 @@
+ #include "nvidia-drm-utils.h"
+ #include "nvidia-drm-encoder.h"
+ 
++#include <linux/version.h>
++#include <linux/utsname.h>
++
+ /*
+  * Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h")
+  * moves a number of helper function definitions from
+@@ -58,6 +61,24 @@ static void nv_drm_connector_destroy(str
+     nv_drm_free(nv_connector);
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0)
++static bool check_edid_override(struct drm_connector *connector)
++{
++	return connector->override_edid != NULL;
++}
++#else
++static bool check_edid_override(struct drm_connector *connector)
++{
++	int ret;
++
++	mutex_lock(&connector->edid_override_mutex);
++	ret = connector->edid_override != NULL;
++	mutex_lock(&connector->edid_override_mutex);
++
++	return ret;
++}
++#endif
++
+ static bool
+ __nv_drm_detect_encoder(struct NvKmsKapiDynamicDisplayParams *pDetectParams,
+                         struct drm_connector *connector,
+@@ -98,7 +119,7 @@ __nv_drm_detect_encoder(struct NvKmsKapi
+             break;
+     }
+ 
+-    if (connector->override_edid) {
++    if (check_edid_override(connector)) {
+         const struct drm_property_blob *edid = connector->edid_blob_ptr;
+ 
+         if (edid->length <= sizeof(pDetectParams->edid.buffer)) {
+--- a/nvidia-drm/nvidia-drm-drv.c	2023-03-04 08:32:31.663651988 +0000
++++ b/nvidia-drm/nvidia-drm-drv.c	2023-03-04 08:33:16.124316171 +0000
+@@ -62,6 +62,9 @@
+ 
+ #include <linux/pci.h>
+ 
++#include <linux/version.h>
++#include <linux/utsname.h>
++
+ /*
+  * Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h")
+  * moves a number of helper function definitions from
+@@ -240,9 +243,10 @@ nv_drm_init_mode_config(struct nv_drm_de
+     dev->mode_config.preferred_depth = 24;
+     dev->mode_config.prefer_shadow = 1;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0)
+     /* Currently unused. Update when needed. */
+-
+     dev->mode_config.fb_base = 0;
++#endif
+ 
+ #if defined(NV_DRM_CRTC_STATE_HAS_ASYNC_FLIP) || \
+     defined(NV_DRM_CRTC_STATE_HAS_PAGEFLIP_FLAGS)
diff -Nru nvidia-graphics-drivers-515-server-515.86.01/debian/dkms_nvidia.conf nvidia-graphics-drivers-515-server-515.86.01/debian/dkms_nvidia.conf
--- nvidia-graphics-drivers-515-server-515.86.01/debian/dkms_nvidia.conf	2023-02-01 10:36:07.000000000 +0000
+++ nvidia-graphics-drivers-515-server-515.86.01/debian/dkms_nvidia.conf	2023-03-04 10:20:38.000000000 +0000
@@ -13,6 +13,7 @@
 DEST_MODULE_LOCATION[2]="/kernel/drivers/char/drm"
 AUTOINSTALL="yes"
 PATCH[0]="disable_fstack-clash-protection_fcf-protection.patch"
+PATCH[1]="buildfix_kernel_6.2.patch"
 # Apply from v4 to v5.12 kernels
 # v5.13 kernels already disable both by default
 # v5.19 kernels may need cf-protection=branch
diff -Nru nvidia-graphics-drivers-515-server-515.86.01/debian/templates/dkms_nvidia.conf.in nvidia-graphics-drivers-515-server-515.86.01/debian/templates/dkms_nvidia.conf.in
--- nvidia-graphics-drivers-515-server-515.86.01/debian/templates/dkms_nvidia.conf.in	2023-02-01 10:36:07.000000000 +0000
+++ nvidia-graphics-drivers-515-server-515.86.01/debian/templates/dkms_nvidia.conf.in	2023-03-04 10:20:35.000000000 +0000
@@ -13,6 +13,7 @@
 DEST_MODULE_LOCATION[2]="/kernel/drivers/char/drm"
 AUTOINSTALL="yes"
 PATCH[0]="disable_fstack-clash-protection_fcf-protection.patch"
+PATCH[1]="buildfix_kernel_6.2.patch"
 # Apply from v4 to v5.12 kernels
 # v5.13 kernels already disable both by default
 # v5.19 kernels may need cf-protection=branch