diff -Nru nvidia-graphics-drivers-450-server-450.119.04/debian/changelog nvidia-graphics-drivers-450-server-450.119.04/debian/changelog
--- nvidia-graphics-drivers-450-server-450.119.04/debian/changelog	2021-05-04 13:45:23.000000000 +0000
+++ nvidia-graphics-drivers-450-server-450.119.04/debian/changelog	2021-05-21 13:45:11.000000000 +0000
@@ -1,3 +1,10 @@
+nvidia-graphics-drivers-450-server (450.119.04-0ubuntu0.20.10.2) groovy; urgency=medium
+
+  * debian/templates/{dkms_nvidia.conf.in|dkms.conf.fragment.in}:
+    - Remove block on uvm on Linux >= 5.10.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 21 May 2021 15:45:11 +0200
+
 nvidia-graphics-drivers-450-server (450.119.04-0ubuntu0.20.10.1) groovy; urgency=medium
 
   * New upstream release (LP: #1925522).
diff -Nru nvidia-graphics-drivers-450-server-450.119.04/debian/dkms.conf.fragment nvidia-graphics-drivers-450-server-450.119.04/debian/dkms.conf.fragment
--- nvidia-graphics-drivers-450-server-450.119.04/debian/dkms.conf.fragment	2021-05-04 13:45:23.000000000 +0000
+++ nvidia-graphics-drivers-450-server-450.119.04/debian/dkms.conf.fragment	2021-05-21 13:45:11.000000000 +0000
@@ -1,5 +1,3 @@
-if [ -z "$EXCLUDED" ]; then
-    BUILT_MODULE_NAME[3]="nvidia-uvm"
-    DEST_MODULE_LOCATION[3]="/kernel/drivers/char/drm"
-fi
+BUILT_MODULE_NAME[3]="nvidia-uvm"
+DEST_MODULE_LOCATION[3]="/kernel/drivers/char/drm"
 #PATCH[2]="buildfix_kernel_4.9_amd64_only.patch"
diff -Nru nvidia-graphics-drivers-450-server-450.119.04/debian/dkms_nvidia.conf nvidia-graphics-drivers-450-server-450.119.04/debian/dkms_nvidia.conf
--- nvidia-graphics-drivers-450-server-450.119.04/debian/dkms_nvidia.conf	2021-05-04 13:45:23.000000000 +0000
+++ nvidia-graphics-drivers-450-server-450.119.04/debian/dkms_nvidia.conf	2021-05-21 13:45:11.000000000 +0000
@@ -1,18 +1,6 @@
 PACKAGE_NAME="nvidia-srv"
 PACKAGE_VERSION="450.119.04"
 CLEAN="make clean"
-UNAME=${kernelver%%-*}
-UNAME_MAJ=${UNAME%%.*}
-UNAME_MIN=${UNAME#*.}
-UNAME_MIN=${UNAME_MIN%%.*}
-TARGET_MAJ=5
-TARGET_MIN=10
-# Disable UVM on from Linux 5.10 on
-if [ "$UNAME_MAJ" -gt "$TARGET_MAJ" ] || [ "$UNAME_MAJ" -eq "$TARGET_MAJ" ] && [ "$UNAME_MIN" -ge "$TARGET_MIN" ]; then
-    EXCLUDED="nvidia-uvm"
-else
-    EXCLUDED=""
-fi
 BUILT_MODULE_NAME[0]="nvidia"
 DEST_MODULE_LOCATION[0]="/kernel/drivers/char/drm"
 PROCS_NUM=`nproc`
diff -Nru nvidia-graphics-drivers-450-server-450.119.04/debian/templates/dkms.conf.fragment.in nvidia-graphics-drivers-450-server-450.119.04/debian/templates/dkms.conf.fragment.in
--- nvidia-graphics-drivers-450-server-450.119.04/debian/templates/dkms.conf.fragment.in	2021-05-04 13:45:23.000000000 +0000
+++ nvidia-graphics-drivers-450-server-450.119.04/debian/templates/dkms.conf.fragment.in	2021-05-21 13:45:11.000000000 +0000
@@ -1,5 +1,3 @@
-if [ -z "$EXCLUDED" ]; then
-    BUILT_MODULE_NAME[3]="nvidia-uvm"
-    DEST_MODULE_LOCATION[3]="/kernel/drivers/char/drm"
-fi
+BUILT_MODULE_NAME[3]="nvidia-uvm"
+DEST_MODULE_LOCATION[3]="/kernel/drivers/char/drm"
 #PATCH[2]="buildfix_kernel_4.9_amd64_only.patch"
diff -Nru nvidia-graphics-drivers-450-server-450.119.04/debian/templates/dkms_nvidia.conf.in nvidia-graphics-drivers-450-server-450.119.04/debian/templates/dkms_nvidia.conf.in
--- nvidia-graphics-drivers-450-server-450.119.04/debian/templates/dkms_nvidia.conf.in	2021-05-04 13:45:23.000000000 +0000
+++ nvidia-graphics-drivers-450-server-450.119.04/debian/templates/dkms_nvidia.conf.in	2021-05-21 13:45:11.000000000 +0000
@@ -1,18 +1,6 @@
 PACKAGE_NAME="nvidia-srv"
 PACKAGE_VERSION="#VERSION#"
 CLEAN="make clean"
-UNAME=${kernelver%%-*}
-UNAME_MAJ=${UNAME%%.*}
-UNAME_MIN=${UNAME#*.}
-UNAME_MIN=${UNAME_MIN%%.*}
-TARGET_MAJ=5
-TARGET_MIN=10
-# Disable UVM on from Linux 5.10 on
-if [ "$UNAME_MAJ" -gt "$TARGET_MAJ" ] || [ "$UNAME_MAJ" -eq "$TARGET_MAJ" ] && [ "$UNAME_MIN" -ge "$TARGET_MIN" ]; then
-    EXCLUDED="nvidia-uvm"
-else
-    EXCLUDED=""
-fi
 BUILT_MODULE_NAME[0]="nvidia"
 DEST_MODULE_LOCATION[0]="/kernel/drivers/char/drm"
 PROCS_NUM=`nproc`