diff --git a/profiles/default/package.keywords/depends b/profiles/default/package.keywords/depends
index bf0688947..815054c39 100644
--- a/profiles/default/package.keywords/depends
+++ b/profiles/default/package.keywords/depends
@@ -515,7 +515,7 @@ net-vpn/wireguard-tools amd64
 ~sci-geosciences/opencpn-5.2.4 amd64
 ~sci-geosciences/opencpn-plugin-climatology-1.4.32.0 amd64
 ~sci-geosciences/opencpn-plugin-dr-1.1 amd64
-~sci-geosciences/opencpn-plugin-findit-1.1007 amd64
+~sci-geosciences/opencpn-plugin-findit-1.2.12.0 amd64
 ~sci-geosciences/opencpn-plugin-gxradar-1.1 amd64
 ~sci-geosciences/opencpn-plugin-iacfleet-0.21.1 amd64
 ~sci-geosciences/opencpn-plugin-launcher-1.3 amd64
diff --git a/profiles/templates/3.6/1_ac_install_disk/2-system/00-calculate-install/calculate.env b/profiles/templates/3.6/1_ac_install_disk/2-system/00-calculate-install/calculate.env
index 2801fe379..795daee17 100644
--- a/profiles/templates/3.6/1_ac_install_disk/2-system/00-calculate-install/calculate.env
+++ b/profiles/templates/3.6/1_ac_install_disk/2-system/00-calculate-install/calculate.env
@@ -1,4 +1,4 @@
-# Calculate format=raw name=calculate.env comment=#  mergepkg(sys-apps/calculate-utils)!=
+# Calculate format=samba name=calculate.env comment=#  mergepkg(sys-apps/calculate-utils)!=
 
 [install]
 #?os_root_type==hdd&&cl_autopartition_set==off#
@@ -33,6 +33,7 @@ cl_kernel_uid = #-cl_install_kernel_uid-#
 os_linux_build = #-os_install_linux_build-#
 #os_install_linux_build#
 cl_home_crypt_set = #-cl_install_home_crypt_set-#
+!os_linux_files =
 
 [update]
 # auto-check updates
diff --git a/profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-390-kernel-5.15.patch b/profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-390-kernel-5.15.patch
new file mode 100644
index 000000000..23c9ed27c
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-390-kernel-5.15.patch
@@ -0,0 +1,39 @@
+# Calculate format=diff pkg(sys-kernel/calculate-sources)=>5.15,5.16&&merge(x11-drivers/nvidia-drivers)=>390,397
+diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
+index 54389be..16320d0 100644
+--- a/kernel/nvidia-drm/nvidia-drm-drv.c
++++ b/kernel/nvidia-drm/nvidia-drm-drv.c
+@@ -811,7 +811,6 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
+ 
+     dev->dev_private = nv_dev;
+     nv_dev->dev = dev;
+-    dev->pdev = pdev;
+ 
+     /* Register DRM device to DRM sub-system */
+ 
+diff --git a/kernel/nvidia/nvlink_linux.c b/kernel/nvidia/nvlink_linux.c
+index 872bc90..434acd6 100644
+--- a/kernel/nvidia/nvlink_linux.c
++++ b/kernel/nvidia/nvlink_linux.c
+@@ -597,7 +597,7 @@ void NVLINK_API_CALL nvlink_sleep(unsigned int ms)
+         // the requested timeout has expired, loop until less
+         // than a jiffie of the desired delay remains.
+         //
+-        current->state = TASK_INTERRUPTIBLE;
++        WRITE_ONCE(current->__state, TASK_INTERRUPTIBLE);
+         do
+         {
+             schedule_timeout(jiffies);
+diff --git a/kernel/nvidia/os-interface.c b/kernel/nvidia/os-interface.c
+index 3603a5a..5ac01c5 100644
+--- a/kernel/nvidia/os-interface.c
++++ b/kernel/nvidia/os-interface.c
+@@ -580,7 +580,7 @@ NV_STATUS NV_API_CALL os_delay(NvU32 MilliSeconds)
+         // the requested timeout has expired, loop until less
+         // than a jiffie of the desired delay remains.
+         //
+-        current->state = TASK_INTERRUPTIBLE;
++        WRITE_ONCE(current->__state, TASK_INTERRUPTIBLE);
+         do
+         {
+             schedule_timeout(jiffies);
diff --git a/sys-apps/calculate-utils/Manifest b/sys-apps/calculate-utils/Manifest
index 20b583cb8..828260dc0 100644
--- a/sys-apps/calculate-utils/Manifest
+++ b/sys-apps/calculate-utils/Manifest
@@ -33,4 +33,6 @@ DIST calculate-update-3.7.2.3.tar.bz2 40054 BLAKE2B d7b7692e29b1441bcae38428550e
 DIST calculate-update-3.7.2.4.tar.bz2 40144 BLAKE2B ae39af7d095d02b387963e79edce5e5026511ea908508d8fe6828ed2540641b106fb3408df467687b78d1c5f0a6a48c8b8da5788be089bf4b459cac841c453a8 SHA512 b65fd0dc0c6ed53105f558be1eb1c782a9b27c4b85a2765e5ccc0e1bf5d03969d6004d1ae7e5346ee6a35f12762564d646ae1f39ce7b0cdd7032a5b20076dded
 DIST calculate-update-3.7.2.5.tar.bz2 40393 BLAKE2B ba989f42b9538db9a801e44659cf0910fafd2b5d69a0eee58dc86973a7ca97b41c368961795aad939c2e73eb456c0349b56834028ea12cabf5f4649520edb693 SHA512 198fad50c8cd96edb4356346843252408c9f307915fa9d9f9d8625c4310b54224ceeab9ff251f54251785d0e061decb8b3fe8cd1517308eb8f113fad0100afd8
 DIST calculate-update-3.7.2.6.tar.bz2 40553 BLAKE2B ac8d847af6fcbda77334f300390dfc9bf5f7f479764623fb5bdad4d7cd454ea6a3486ca99209c6756b60a064df4416acba945c15b59f01c86cb6ee4425931a13 SHA512 e8253f54ba642450aee86cfd4b9b258ed274e11b8dac3b1b366d7b9420f59205b7ac65da43c8aac2b95d3e550b8468ae9a13599d485d92ee0f20c1bf0ab3d1e0
+DIST calculate-update-3.7.2.7.tar.bz2 40485 BLAKE2B f2f2091396a5ffc3c49b8f9f0ddf012fdf9aa130dc3502435db7c9073fd970051a434b1386aa4dc7e4ab70eb9ee1834751c4f9c7963b92345d7cff3ea912c14e SHA512 d24c30f12a54e1f6ea8ee58662dea10d8d2b463ab97e70ca307dcb6b0585d714c91ebfef713f39c2ce09a9f75e793a06cbfb98d08428c971fd5aa80511722aa8
+DIST calculate-update-3.7.2.8.tar.bz2 40520 BLAKE2B b4fb8938de38002317d30b39691b48a3056966aa3bc16de6891ed5b2bfb427d1bfc4053cdc81c2fe94a19cc4d056b2430d9f9fef27129b537cd33a47877d58f0 SHA512 44a184439756808fd24f882af9066d15ed431d27bab80f232b2b780b3aea56952733fe9ecd449ca382b107d0bbff52d236ff1d503980a251b3f5f1e41ac1fe53
 DIST calculate-update-3.7.2.tar.bz2 40097 BLAKE2B a8a7fbeae807acc967c9b48388b97a96cdcc6d49e1efe0ea789607b234b714fa1759b64c05576792f73136af0cbbe98364be7f57dba9861bd9eb64a3978baf00 SHA512 bf364df9857efc29513fc7a2c0fe19d0c6ac0cdec935cb08eecdd27993a066f15ed9900271f47dd12d4e2adf560b204485725f908ad8904b7c358e3f1df4a1f7