diff --git a/Patches/LineageOS-14.1/android_frameworks_av/385240.patch b/Patches/LineageOS-14.1/android_frameworks_av/385240.patch
index 13810a8a..164cb83c 100644
--- a/Patches/LineageOS-14.1/android_frameworks_av/385240.patch
+++ b/Patches/LineageOS-14.1/android_frameworks_av/385240.patch
@@ -1,4 +1,4 @@
-From 5e888da782da37b0e2df2bc078e5e68dc87340e3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Haripriya Deshmukh <haripriya.deshmukh@ittiam.com>
 Date: Tue, 5 Dec 2023 18:32:38 +0000
 Subject: [PATCH] Fix out of bounds read and write in onQueueFilled in outQueue
@@ -15,7 +15,7 @@ Change-Id: Ic230d10048193a785f185dc6a7de6f455f9318c1
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
-index 411a251d150..b14890300e1 100644
+index 411a251d15..b14890300e 100644
 --- a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
 +++ b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
 @@ -316,8 +316,11 @@ void SoftMPEG4::onQueueFilled(OMX_U32 /* portIndex */) {
diff --git a/Patches/LineageOS-14.1/android_frameworks_av/385243.patch b/Patches/LineageOS-14.1/android_frameworks_av/385243.patch
index 27fb345d..5abb9fc9 100644
--- a/Patches/LineageOS-14.1/android_frameworks_av/385243.patch
+++ b/Patches/LineageOS-14.1/android_frameworks_av/385243.patch
@@ -1,4 +1,4 @@
-From 63669b42bb2fbdf4b242944e88bb541d3a6fe465 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Haripriya Deshmukh <haripriya.deshmukh@ittiam.com>
 Date: Tue, 19 Sep 2023 20:42:45 +0000
 Subject: [PATCH] Validate OMX Params for VPx encoders
@@ -19,7 +19,7 @@ Change-Id: I9bb17112d9f0217b6af0343afecc9c943453b757
  1 file changed, 9 insertions(+)
 
 diff --git a/media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp b/media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp
-index 04d8dda075e..1be823c9755 100644
+index 04d8dda075..1be823c975 100644
 --- a/media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp
 +++ b/media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp
 @@ -532,6 +532,11 @@ OMX_ERRORTYPE SoftVPXEncoder::setConfig(
diff --git a/Patches/LineageOS-14.1/android_frameworks_base/385241.patch b/Patches/LineageOS-14.1/android_frameworks_base/385241.patch
index d0474409..f9799dc8 100644
--- a/Patches/LineageOS-14.1/android_frameworks_base/385241.patch
+++ b/Patches/LineageOS-14.1/android_frameworks_base/385241.patch
@@ -1,4 +1,4 @@
-From ca4c85efdba2b8f4318e34759d4fd8a6bd7c9943 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: kumarashishg <kumarashishg@google.com>
 Date: Mon, 17 Jul 2023 12:01:18 +0000
 Subject: [PATCH] Resolve custom printer icon boundary exploit.
@@ -18,10 +18,10 @@ Change-Id: Ic383eed92b599e5f9aa7f1c4a58135336e8e6e68
  1 file changed, 33 insertions(+), 1 deletion(-)
 
 diff --git a/services/print/java/com/android/server/print/PrintManagerService.java b/services/print/java/com/android/server/print/PrintManagerService.java
-index 1feb81664e95c..9dc22162a2c1c 100644
+index 1feb81664e95..9dc22162a2c1 100644
 --- a/services/print/java/com/android/server/print/PrintManagerService.java
 +++ b/services/print/java/com/android/server/print/PrintManagerService.java
-@@ -203,12 +203,44 @@ public Icon getCustomPrinterIcon(PrinterId printerId, int userId) {
+@@ -203,12 +203,44 @@ public final class PrintManagerService extends SystemService {
              }
              final long identity = Binder.clearCallingIdentity();
              try {
diff --git a/Patches/LineageOS-14.1/android_frameworks_base/385242.patch b/Patches/LineageOS-14.1/android_frameworks_base/385242.patch
index 65c96414..8a13d18e 100644
--- a/Patches/LineageOS-14.1/android_frameworks_base/385242.patch
+++ b/Patches/LineageOS-14.1/android_frameworks_base/385242.patch
@@ -1,4 +1,4 @@
-From ace2c7017edeb221b293513497a9b7e4480bfcbd Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Dmitry Dementyev <dementyev@google.com>
 Date: Wed, 3 Jan 2024 09:26:56 -0800
 Subject: [PATCH] Close AccountManagerService.session after timeout.
@@ -16,10 +16,10 @@ Change-Id: I39afbe8f4bfc6b652365c798c64328797f27e5d4
  1 file changed, 10 insertions(+)
 
 diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
-index 126955add01a9..ecd642bebb669 100644
+index 9069cd7ffe9c..b28e532c01bb 100644
 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java
 +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
-@@ -180,6 +180,7 @@ public void onUnlockUser(int userHandle) {
+@@ -182,6 +182,7 @@ public class AccountManagerService
  
      final MessageHandler mMessageHandler;
  
@@ -27,7 +27,7 @@ index 126955add01a9..ecd642bebb669 100644
      // Messages that can be sent on mHandler
      private static final int MESSAGE_TIMED_OUT = 3;
      private static final int MESSAGE_COPY_SHARED_ACCOUNT = 4;
-@@ -4172,6 +4173,7 @@ public Session(UserAccounts accounts, IAccountManagerResponse response, String a
+@@ -4202,6 +4203,7 @@ public class AccountManagerService
              synchronized (mSessions) {
                  mSessions.put(toString(), this);
              }
@@ -35,7 +35,7 @@ index 126955add01a9..ecd642bebb669 100644
              if (response != null) {
                  try {
                      response.asBinder().linkToDeath(this, 0 /* flags */);
-@@ -4279,6 +4281,11 @@ private void unbind() {
+@@ -4357,6 +4359,11 @@ public class AccountManagerService
              }
          }
  
@@ -47,7 +47,7 @@ index 126955add01a9..ecd642bebb669 100644
          public void cancelTimeout() {
              mMessageHandler.removeMessages(MESSAGE_TIMED_OUT, this);
          }
-@@ -4315,6 +4322,9 @@ public void onServiceDisconnected(ComponentName name) {
+@@ -4393,6 +4400,9 @@ public class AccountManagerService
  
          public void onTimedOut() {
              IAccountManagerResponse response = getResponseAndClose();
diff --git a/Patches/LineageOS-14.1/android_system_bt/385236.patch b/Patches/LineageOS-14.1/android_system_bt/385236.patch
index dab204bb..bc4161d8 100644
--- a/Patches/LineageOS-14.1/android_system_bt/385236.patch
+++ b/Patches/LineageOS-14.1/android_system_bt/385236.patch
@@ -1,4 +1,4 @@
-From b7bac88b9cfc050ee13fc620a19f1f78c8311f3d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ugo Yu <ugoyu@google.com>
 Date: Thu, 29 Nov 2018 17:55:40 +0800
 Subject: [PATCH] Fix OOB caused by invalid SMP packet length
@@ -16,7 +16,7 @@ Change-Id: I889d2de97b1aab706c850a950f668aba558f240f
  3 files changed, 64 insertions(+)
 
 diff --git a/stack/smp/smp_act.c b/stack/smp/smp_act.c
-index 8702e109578..c2dfc7205f8 100644
+index fffee6f75..675a99600 100644
 --- a/stack/smp/smp_act.c
 +++ b/stack/smp/smp_act.c
 @@ -579,6 +579,14 @@ void smp_proc_pair_cmd(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
@@ -34,7 +34,7 @@ index 8702e109578..c2dfc7205f8 100644
      STREAM_TO_UINT8(p_cb->peer_io_caps, p);
      STREAM_TO_UINT8(p_cb->peer_oob_flag, p);
      STREAM_TO_UINT8(p_cb->peer_auth_req, p);
-@@ -890,6 +898,14 @@ void smp_br_process_pairing_command(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
+@@ -889,6 +897,14 @@ void smp_br_process_pairing_command(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
  
      p_cb->flags |= SMP_PAIR_FLAG_ENC_AFTER_PAIR;
  
@@ -49,7 +49,7 @@ index 8702e109578..c2dfc7205f8 100644
      STREAM_TO_UINT8(p_cb->peer_io_caps, p);
      STREAM_TO_UINT8(p_cb->peer_oob_flag, p);
      STREAM_TO_UINT8(p_cb->peer_auth_req, p);
-@@ -1107,9 +1123,18 @@ void smp_proc_id_info(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
+@@ -1106,9 +1122,18 @@ void smp_proc_id_info(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
  void smp_proc_id_addr(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
  {
      UINT8   *p = (UINT8 *)p_data;
@@ -68,7 +68,7 @@ index 8702e109578..c2dfc7205f8 100644
      smp_update_key_mask (p_cb, SMP_SEC_KEY_TYPE_ID, TRUE);
  
      STREAM_TO_UINT8(pid_key.pid_key.addr_type, p);
-@@ -1134,8 +1159,17 @@ void smp_proc_id_addr(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
+@@ -1133,8 +1158,17 @@ void smp_proc_id_addr(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
  void smp_proc_srk_info(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
  {
      tBTM_LE_KEY_VALUE le_key;
@@ -87,7 +87,7 @@ index 8702e109578..c2dfc7205f8 100644
  
      /* save CSRK to security record */
 diff --git a/stack/smp/smp_int.h b/stack/smp/smp_int.h
-index aea85380edd..bfac772b9d5 100644
+index aea85380e..bfac772b9 100644
 --- a/stack/smp/smp_int.h
 +++ b/stack/smp/smp_int.h
 @@ -488,6 +488,7 @@ extern void smp_xor_128(BT_OCTET16 a, BT_OCTET16 b);
@@ -99,7 +99,7 @@ index aea85380edd..bfac772b9d5 100644
  extern void smp_reject_unexpected_pairing_command(BD_ADDR bd_addr);
  extern tSMP_ASSO_MODEL smp_select_association_model(tSMP_CB *p_cb);
 diff --git a/stack/smp/smp_utils.c b/stack/smp/smp_utils.c
-index 6ea98f4bac5..ec6f0307d87 100644
+index 6ea98f4ba..ec6f0307d 100644
 --- a/stack/smp/smp_utils.c
 +++ b/stack/smp/smp_utils.c
 @@ -962,6 +962,35 @@ void smp_proc_pairing_cmpl(tSMP_CB *p_cb)
diff --git a/Patches/LineageOS-14.1/android_system_bt/385237.patch b/Patches/LineageOS-14.1/android_system_bt/385237.patch
index cfa8c381..d14c489f 100644
--- a/Patches/LineageOS-14.1/android_system_bt/385237.patch
+++ b/Patches/LineageOS-14.1/android_system_bt/385237.patch
@@ -1,4 +1,4 @@
-From 6dec464a0690efa6f008779876ef90f2c45df691 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hui Peng <phui@google.com>
 Date: Tue, 28 Nov 2023 19:57:20 +0000
 Subject: [PATCH] Fix an OOB bug in smp_proc_sec_req
@@ -16,7 +16,7 @@ Change-Id: Id4c65801ff8519aff18b24007e344934493cab55
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/stack/smp/smp_act.c b/stack/smp/smp_act.c
-index c2dfc7205f..dcbb54aee8 100644
+index 675a99600..7491d0972 100644
 --- a/stack/smp/smp_act.c
 +++ b/stack/smp/smp_act.c
 @@ -481,9 +481,17 @@ void smp_send_ltk_reply(tSMP_CB *p_cb, tSMP_INT_DATA *p_data)
diff --git a/Patches/LineageOS-14.1/android_system_bt/385238.patch b/Patches/LineageOS-14.1/android_system_bt/385238.patch
index d533f370..088d32d0 100644
--- a/Patches/LineageOS-14.1/android_system_bt/385238.patch
+++ b/Patches/LineageOS-14.1/android_system_bt/385238.patch
@@ -1,4 +1,4 @@
-From a4e7043cca16478786da91619e312670f4f29015 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hui Peng <phui@google.com>
 Date: Fri, 15 Dec 2023 22:55:33 +0000
 Subject: [PATCH] Reland: Fix an OOB write bug in attp_build_value_cmd
@@ -18,10 +18,10 @@ Change-Id: Ieffac6db5c6359b071efc599f7a70de609b80b72
  1 file changed, 47 insertions(+), 11 deletions(-)
 
 diff --git a/stack/gatt/att_protocol.c b/stack/gatt/att_protocol.c
-index e0963622049..7981950a30e 100644
+index 1e9948185..b7b835452 100644
 --- a/stack/gatt/att_protocol.c
 +++ b/stack/gatt/att_protocol.c
-@@ -274,46 +274,82 @@ BT_HDR *attp_build_opcode_cmd(UINT8 op_code)
+@@ -281,46 +281,82 @@ BT_HDR *attp_build_opcode_cmd(UINT8 op_code)
  BT_HDR *attp_build_value_cmd (UINT16 payload_size, UINT8 op_code, UINT16 handle,
                                UINT16 offset, UINT16 len, UINT8 *p_data)
  {
diff --git a/Patches/LineageOS-14.1/android_system_bt/385239.patch b/Patches/LineageOS-14.1/android_system_bt/385239.patch
index 6a7f0843..ff45d609 100644
--- a/Patches/LineageOS-14.1/android_system_bt/385239.patch
+++ b/Patches/LineageOS-14.1/android_system_bt/385239.patch
@@ -1,4 +1,4 @@
-From 87a4f4196ec70bb7365a1e206be63073e102544b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hui Peng <phui@google.com>
 Date: Tue, 9 Jan 2024 22:38:20 +0000
 Subject: [PATCH] Fix a security bypass issue in
@@ -18,7 +18,7 @@ Change-Id: Ib7cf66019b3d45a2a23d235ad5f9dc406394456f
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/stack/btm/btm_sec.c b/stack/btm/btm_sec.c
-index 23b334ce27..cf90725490 100644
+index 1a21bce09..9b447ea07 100644
 --- a/stack/btm/btm_sec.c
 +++ b/stack/btm/btm_sec.c
 @@ -245,8 +245,7 @@ static BOOLEAN access_secure_service_from_temp_bond(const tBTM_SEC_DEV_REC* p_de
diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh
index 73379690..1427acfd 100644
--- a/Scripts/Common/Fix_CVE_Patchers.sh
+++ b/Scripts/Common/Fix_CVE_Patchers.sh
@@ -127,7 +127,7 @@ done
 declare -a threeDotTen=("${threeDotFour[@]}" "android_kernel_htc_msm8994.sh" "android_kernel_lge_msm8992.sh" "android_kernel_motorola_msm8992.sh" "android_kernel_asus_fugu.sh" "android_kernel_asus_msm8916.sh" "android_kernel_htc_flounder.sh" "android_kernel_htc_msm8994.sh" "android_kernel_huawei_angler.sh" "android_kernel_lge_bullhead.sh" "android_kernel_moto_shamu.sh" "android_kernel_motorola_msm8952.sh" "android_kernel_nextbit_msm8992.sh" "android_kernel_oneplus_msm8994.sh" "android_kernel_cyanogen_msm8916.sh" "android_kernel_google_yellowstone.sh" "android_kernel_samsung_apq8084.sh" "android_kernel_motorola_msm8916.sh");
 for script in "${threeDotTen[@]}"
 do
-	commentPatches $script "CVE-2016-1583/3.18" "CVE-2018-17972/3.18" "CVE-2018-20169/3.18" "CVE-2019-2214/3.18" "CVE-2020-0427/3.18" "CVE-2021-21781/3.18" "CVE-2022-40768/4.4";
+	commentPatches $script "CVE-2016-1583/3.18" "CVE-2018-17972/3.18" "CVE-2018-20169/3.18" "CVE-2019-2214/3.18" "CVE-2020-0427/3.18" "CVE-2021-21781/3.18" "CVE-2021-46939/3.18" "CVE-2022-40768/4.4";
 done
 #3.18
 declare -a threeDotEighteen=("${threeDotTen[@]}" "android_kernel_samsung_universal8890.sh" "android_kernel_google_dragon.sh" "android_kernel_zte_msm8996.sh" "android_kernel_asus_msm8953.sh" "android_kernel_google_marlin.sh" "android_kernel_motorola_msm8996.sh" "android_kernel_oneplus_msm8996.sh");
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh
index a52c686e..b1ebed9a 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh
@@ -516,7 +516,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0047.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/3.18/0001.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh
index e726b4d8..1821caf5 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh
@@ -602,7 +602,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0047.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0054.patch
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8952.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8952.sh
index 24889020..7628ac33 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8952.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8952.sh
@@ -447,7 +447,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0006.patch
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh
index ee5264aa..0fb98a5b 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh
@@ -609,7 +609,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0073.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/3.18/0001.patch
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh
index 41f0ebab..30cd4fd4 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh
@@ -395,7 +395,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0006.patch
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh
index 4ee711ee..b6dd2706 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh
@@ -405,7 +405,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0073.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/3.18/0001.patch
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh
index 5b6e007d..6ae78fb6 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh
@@ -530,7 +530,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0047.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0054.patch
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh
index 0a634029..a8033251 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh
@@ -538,7 +538,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0047.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0054.patch
diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
index cbb9d7c3..c1be6497 100644
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
@@ -392,7 +392,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0006.patch
diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh
index 109fe5a0..ffabcf0b 100644
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh
@@ -454,7 +454,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0073.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/3.18/0001.patch
diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_apq8084.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_apq8084.sh
index 991fba1f..fa153330 100644
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_apq8084.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_apq8084.sh
@@ -258,7 +258,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46946/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0065.patch
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
index cbb9d7c3..c1be6497 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
@@ -392,7 +392,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0006.patch
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh
index eeb50fbe..858bb97c 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh
@@ -445,7 +445,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0007.patch
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
index 5491b08a..cdf004e6 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
@@ -373,7 +373,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46946/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0047.patch
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh
index b8129327..43caa2cc 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh
@@ -375,7 +375,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46946/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0047.patch
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh
index c71fc877..e5e50ce5 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh
@@ -290,7 +290,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0065.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0073.patch
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
index cf31f3ac..eb520dea 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
@@ -426,7 +426,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46905/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46939/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47086/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0047.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0063.patch