diff --git a/.gitignore b/.gitignore
index 6f96dfa4..71c08c64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ Repos/
 Untracked/
 .Trash-1000
 pending_commit.txt
+dos.duperemove
diff --git a/Patches/Linux b/Patches/Linux
index 2e387233..d4ac6056 160000
--- a/Patches/Linux
+++ b/Patches/Linux
@@ -1 +1 @@
-Subproject commit 2e38723392cd50b206a6c71aa7542afa59d0df2e
+Subproject commit d4ac6056f0d92435073326cb970fa63d04449ac4
diff --git a/PrebuiltApps b/PrebuiltApps
index 3a4541a5..77fd3e3f 160000
--- a/PrebuiltApps
+++ b/PrebuiltApps
@@ -1 +1 @@
-Subproject commit 3a4541a5c58cbe3a031c7eea09cd186d6fe5ac02
+Subproject commit 77fd3e3f764a19a28ca2db68d563b2896c10a5c5
diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh
index c89e269f..58ffb37d 100644
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh
@@ -262,7 +262,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0045.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0015.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0016.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0013.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0014.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0015.patch
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh
index bfb264b4..95b155c3 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh
@@ -191,7 +191,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0015.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0016.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0013.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0014.patch
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
index 511dc051..4f19afd2 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
@@ -231,7 +231,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0044.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0045.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0016.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0013.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0014.patch
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh
index 4849fc68..4aa17d20 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh
@@ -159,7 +159,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0015.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0016.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0017.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0013.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0014.patch
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh
index 7de16258..792f3860 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh
@@ -225,6 +225,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29370/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.19/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29372/^5.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374/4.19/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.19/0011.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.19/0012.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.19/0013.patch
@@ -245,7 +246,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/^5.8/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.19/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.19/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.19/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.19/0009.patch
@@ -270,10 +271,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29264/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.19/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.19/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.19/0011.patch
-editKernelLocalversion "-dos.p275"
+editKernelLocalversion "-dos.p277"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
index 39f5d7c7..af4ec5de 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
@@ -326,6 +326,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29370/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29372/^5.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0008.patch
@@ -343,7 +344,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.14/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.14/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.14/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.14/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.14/0006.patch
@@ -365,9 +366,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch
-editKernelLocalversion "-dos.p369"
+editKernelLocalversion "-dos.p371"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh
index 8bc67ba1..7eb9a2cd 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh
@@ -214,7 +214,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0012.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/4.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0010.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0011.patch
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh
index c3da0827..8f442820 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh
@@ -213,7 +213,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0012.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/4.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0010.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0011.patch
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh
index 683fa3d2..4b293c0a 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh
@@ -100,6 +100,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25670/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0006.patch
 editKernelLocalversion "-dos.p101"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh
index 13c7f042..d38144a5 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh
@@ -48,6 +48,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
-editKernelLocalversion "-dos.p49"
+editKernelLocalversion "-dos.p48"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh
index 79f115ee..fb9b9033 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh
@@ -87,6 +87,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28941/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29372/^5.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0008.patch
@@ -105,7 +106,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.14/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3493/^5.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.14/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.14/0005.patch
@@ -129,7 +130,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch
-editKernelLocalversion "-dos.p131"
+editKernelLocalversion "-dos.p133"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
index b7b49c2e..4fdf4903 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
@@ -114,7 +114,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0045.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0016.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0017.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.9/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0013.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0014.patch
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh
index ba5f6836..b28c4392 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh
@@ -165,7 +165,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0014.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/4.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0010.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0011.patch
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh
index 3f473e6f..024d426f 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh
@@ -55,6 +55,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25670/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0006.patch
 editKernelLocalversion "-dos.p56"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh
index 135897f3..e3a0e2dc 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh
@@ -48,6 +48,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0006.patch
 editKernelLocalversion "-dos.p49"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh
index 1c3bc66e..587cb4f5 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh
@@ -60,6 +60,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/^5.12/0001.patch
-editKernelLocalversion "-dos.p61"
+editKernelLocalversion "-dos.p60"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh
index 4f1cad71..a61c977b 100644
--- a/Scripts/LineageOS-18.1/Functions.sh
+++ b/Scripts/LineageOS-18.1/Functions.sh
@@ -100,7 +100,6 @@ patchWorkspace() {
 
 	source build/envsetup.sh;
 	repopick -i 300595; #system/netd: add missing override keyword
-	repopick -i 308360; #oneplus_msm8998-common: Decrease launch boost to 3sec
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh
index 2822c7d1..ddc13026 100644
--- a/Scripts/LineageOS-18.1/Patch.sh
+++ b/Scripts/LineageOS-18.1/Patch.sh
@@ -257,7 +257,6 @@ git revert --no-edit 0ba2cb240e8483fa85fcc831328f70f65eeb7180 2be3c88c331387f039
 
 enterAndClear "device/oneplus/msm8998-common";
 awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation
-awk -i inplace '!/hal_camera_default, sensors_dbg_prop/' sepolicy/vendor/hal_camera_default.te; #Remove a neverallow
 
 enterAndClear "device/oppo/common";
 awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation