From 4d902672dfe4bb4800011ac4913c2ee042b1e0d7 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Thu, 25 Mar 2021 00:35:53 -0400
Subject: [PATCH] More cleanup

---
 Manifests/Manifest_LAOS-15.1.xml              |   5 -
 Manifests/Manifest_LAOS-16.0.xml              |   6 +-
 .../android_kernel_samsung_smdk4412.sh        | 201 ------------------
 Scripts/LineageOS-15.1/Functions.sh           |   6 +-
 .../android_kernel_samsung_smdk4412.sh        | 200 -----------------
 Scripts/LineageOS-16.0/Functions.sh           |   8 +-
 6 files changed, 6 insertions(+), 420 deletions(-)
 delete mode 100644 Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh
 delete mode 100644 Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_smdk4412.sh

diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml
index 2f22bda7..d4dac453 100644
--- a/Manifests/Manifest_LAOS-15.1.xml
+++ b/Manifests/Manifest_LAOS-15.1.xml
@@ -134,11 +134,6 @@
 	<!-- Samsung Common -->
 	<project path="device/samsung/qcom-common" name="LineageOS/android_device_samsung_qcom-common" remote="github" />
 	<project path="hardware/samsung" name="LineageOS/android_hardware_samsung" remote="github" />
-	<project path="kernel/samsung/smdk4412" name="LineageOS/android_kernel_samsung_smdk4412" remote="github" />
-
-	<!-- Samsung Galaxy S II (i9100) -->
-	<project path="device/samsung/i9100" name="LineageOS/android_device_samsung_i9100" remote="github" />
-	<project path="device/samsung/galaxys2-common" name="LineageOS/android_device_samsung_galaxys2-common" remote="github" />
 
 	<!-- ZTE Axon 7 (axon7) -->
 	<project path="device/zte/axon7" name="LineageOS/android_device_zte_axon7" remote="github" />
diff --git a/Manifests/Manifest_LAOS-16.0.xml b/Manifests/Manifest_LAOS-16.0.xml
index b8385116..0fa75ac0 100644
--- a/Manifests/Manifest_LAOS-16.0.xml
+++ b/Manifests/Manifest_LAOS-16.0.xml
@@ -101,6 +101,7 @@
 	<project path="kernel/asus/fugu" name="LineageOS/android_kernel_asus_fugu" remote="github" />
 
 	<!-- OnePlus 5 (cheeseburger) -->
+	<project path="device/oppo/common" name="LineageOS/android_device_oppo_common" remote="github" />
 	<project path="device/oneplus/cheeseburger" name="LineageOS/android_device_oneplus_cheeseburger" remote="github" />
 	<project path="device/oneplus/msm8998-common" name="LineageOS/android_device_oneplus_msm8998-common" remote="github" />
 	<project path="kernel/oneplus/msm8998" name="android-linux-stable/op5" remote="github" revision="lineage-17.1" />
@@ -111,11 +112,6 @@
 	<!-- Samsung Common -->
 	<project path="device/samsung/qcom-common" name="LineageOS/android_device_samsung_qcom-common" remote="github" />
 	<project path="hardware/samsung" name="LineageOS/android_hardware_samsung" remote="github" />
-	<project path="kernel/samsung/smdk4412" name="LineageOS/android_kernel_samsung_smdk4412" remote="github" />
-
-	<!-- Samsung Galaxy S II (i9100) -->
-	<project path="device/samsung/i9100" name="LineageOS/android_device_samsung_i9100" remote="github" />
-	<project path="device/samsung/galaxys2-common" name="LineageOS/android_device_samsung_galaxys2-common" remote="github" />
 
 	<!-- Wileyfox Storm (kipper) -->
 	<project path="device/wileyfox/kipper" name="LineageOS/android_device_wileyfox_kipper" remote="github" />
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh
deleted file mode 100644
index d23c434f..00000000
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/bin/bash
-cd "$DOS_BUILD_BASE""kernel/samsung/smdk4412"
-git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/0090-Unknown/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4131/^3.2/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4132/3.0/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4132/^3.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4347/^3.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4347/^3.2/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-5327/^3.1/0001.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2127/^3.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2372/^3.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2375/^3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-3375/^3.2.24/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6544/3.0/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6545/^3.6/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4299/^3.11.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4345/^3.11.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4512/^3.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4587/^3.12.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-6378/^3.12.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-6380/^3.12.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-6381/^3.12.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-6383/^3.11.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-7027/^3.11.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-7339/^3.12.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-7470/^3.11.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-0055/^3.14/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-0077/^3.13.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-0101/^3.13.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1444/^3.11.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1445/^3.11.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1446/^3.12.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1737/^3.14.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1738/^3.14.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1739/^3.13.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2678/^3.14/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3153/^3.14.5/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3181/^3.16.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3601/^3.16.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3687/^3.17.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4652/^3.15.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/^3.15.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/^3.15.2/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/^3.15.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/^3.15.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/^3.15.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/^3.16.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/^3.16.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/^3.16.3/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7841/^3.17.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8133/^3.18.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8134/^3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8159/^4.0/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9420/^3.18.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9584/^3.18.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9728/^3.18.2/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9870/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9895/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9900/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-1421/^3.18.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-3331/^4.0/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-5156/^4.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6252/^4.1.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6640/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/^4.2.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7799/^4.2.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8944/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2185/^4.5.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2186/^4.5.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2544/^4.4.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3857/^4.8/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4485/^4.5.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4580/^4.5.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4913/^4.5.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5244/^4.6.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5828/^4.6.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6480/^4.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6753/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5.2/0002.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8463/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8646/^4.3.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9604/^4.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0403/3.0-^3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0404/^3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0430/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0648/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0706/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0786/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0861/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-2618/^4.9.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6074/^4.9.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6345/^4.9.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/^4.9.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7184/^4.10.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7184/^4.10.6/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7308/^4.10.6/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/^4.11.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8824/^4.14.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9984/^4.11.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11090/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11176/^4.11.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/^4.12.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12153/^4.13.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/^4.4/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13246/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13292/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13695/^4.12.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14106/^4.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14489/^4.13.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/^3.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/^4.13.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/^4.13.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16533/^4.13.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16537/^4.13.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17450/^4.14.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17558/^4.14.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17805/^4.14.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/^4.14.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18079/^4.12.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18360/^4.11.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000363/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000380/^4.11.5/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/^4.16/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/^4.16/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5332/^4.14.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5333/^4.14.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5750/^4.14.15/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7492/^4.14.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7566/^4.15/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7755/^4.15.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7757/^4.15.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8781/^4.15/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9416/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9516/^4.17/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12233/^4.17.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/^4.18.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18710/^4.19/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20511/^4.18.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2001/^3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/^5.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3837/^3.14/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10607/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14284/^5.2.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15216/^5.0.14/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/^5.2.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/^5.3.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19066/^5.3.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/^5.3.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19524/^5.3.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19527/^5.2.10/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19528/^5.3.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19528/^5.3.7/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10773/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/^5.6.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/^5.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch
-git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p197"
-cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index 6be6cea6..53aadce0 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -18,7 +18,7 @@
 #Last verified: 2018-04-27
 
 patchAllKernels() {
-	startPatcher "kernel_asus_fugu kernel_asus_msm8916 kernel_google_dragon kernel_htc_flounder kernel_htc_msm8994 kernel_huawei_angler kernel_lge_bullhead kernel_lge_hammerhead kernel_lge_msm8996 kernel_moto_shamu kernel_nextbit_msm8992 kernel_oneplus_msm8994 kernel_samsung_smdk4412 kernel_zte_msm8996";
+	startPatcher "kernel_asus_fugu kernel_asus_msm8916 kernel_google_dragon kernel_htc_flounder kernel_htc_msm8994 kernel_huawei_angler kernel_lge_bullhead kernel_lge_hammerhead kernel_lge_msm8996 kernel_moto_shamu kernel_nextbit_msm8992 kernel_oneplus_msm8994 kernel_zte_msm8996";
 }
 export -f patchAllKernels;
 
@@ -60,7 +60,7 @@ buildAll() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi;
 	if [ "$DOS_OPTIMIZE_IMAGES" = true ]; then optimizeImagesRecursive "$DOS_BUILD_BASE"; fi;
 	#SD801
-	buildDevice hammerhead; #16.0 has bluetooth issues?
+	buildDevice hammerhead; #Last version with working Bluetooth
 	#SD805
 	buildDevice shamu verity; #Last version with working IMS
 	#SD808
@@ -76,8 +76,6 @@ buildAll() {
 	buildDevice axon7; #broken - needs vendor patching
 	buildDevice h870;
 	buildDevice us997;
-	#Exynos
-	buildDeviceUserDebug i9100;
 	#Intel
 	buildDevice fugu;
 	#Tegra
diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_smdk4412.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_smdk4412.sh
deleted file mode 100644
index caf46f4e..00000000
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_smdk4412.sh
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/bash
-cd "$DOS_BUILD_BASE""kernel/samsung/smdk4412"
-git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/0090-Unknown/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4131/^3.2/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4132/3.0/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4132/^3.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4347/^3.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-4347/^3.2/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-5327/^3.1/0001.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2127/^3.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2372/^3.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2375/^3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6544/3.0/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6545/^3.6/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-1763/^3.7.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4299/^3.11.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4345/^3.11.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4512/^3.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4587/^3.12.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-6378/^3.12.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-6380/^3.12.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-6381/^3.12.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-6383/^3.11.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-7027/^3.11.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-7339/^3.12.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-7470/^3.11.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-0055/^3.14/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-0077/^3.13.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-0101/^3.13.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1444/^3.11.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1445/^3.11.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1446/^3.12.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1737/^3.14.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1738/^3.14.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1739/^3.13.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2678/^3.14/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3153/^3.14.5/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3181/^3.16.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3601/^3.16.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3687/^3.17.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4652/^3.15.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/^3.15.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/^3.15.2/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4667/^3.15.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4699/^3.15.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5077/^3.15.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-5471/^3.16.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/^3.16.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-6416/^3.16.3/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7841/^3.17.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8133/^3.18.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8134/^3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8159/^4.0/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9420/^3.18.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9584/^3.18.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9728/^3.18.2/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9870/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9895/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9900/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-1421/^3.18.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-3331/^4.0/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-5156/^4.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6252/^4.1.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/^4.2.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7799/^4.2.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8944/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2185/^4.5.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2186/^4.5.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2544/^4.4.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4485/^4.5.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4580/^4.5.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4913/^4.5.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5244/^4.6.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5828/^4.6.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6480/^4.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6753/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5.2/0002.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8463/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8646/^4.3.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9604/^4.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0403/3.0-^3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0404/^3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0430/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0648/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0706/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0786/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0861/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-2618/^4.9.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6074/^4.9.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6345/^4.9.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/^4.9.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7184/^4.10.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7184/^4.10.6/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7308/^4.10.6/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/^4.11.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8824/^4.14.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9984/^4.11.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11089/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11090/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11176/^4.11.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/^4.12.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12153/^4.13.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/^4.4/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13246/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13292/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13695/^4.12.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14106/^4.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14489/^4.13.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/^3.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/^4.13.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/^4.13.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16533/^4.13.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16537/^4.13.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17450/^4.14.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17558/^4.14.5/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17805/^4.14.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/^4.14.8/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18079/^4.12.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18360/^4.11.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000363/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000380/^4.11.5/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/^4.16/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/^4.16/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5332/^4.14.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5333/^4.14.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5750/^4.14.15/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7492/^4.14.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7566/^4.15/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7755/^4.15.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7757/^4.15.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8781/^4.15/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9416/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9516/^4.17/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12233/^4.17.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/^4.18.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18710/^4.19/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20511/^4.18.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2001/^3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/^5.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3837/^3.14/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10607/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14284/^5.2.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15216/^5.0.14/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/^5.2.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/^5.3.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19066/^5.3.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/^5.3.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19524/^5.3.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19527/^5.2.10/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19528/^5.3.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19528/^5.3.7/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10773/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/^5.6.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/^5.7/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch
-git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p196"
-cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index e6a206ad..555929f3 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -18,7 +18,7 @@
 #Last verified: 2018-04-27
 
 patchAllKernels() {
-	startPatcher "kernel_asus_fugu kernel_asus_msm8953 kernel_cyanogen_msm8916 kernel_cyanogen_msm8974 kernel_google_yellowstone kernel_lge_hammerhead kernel_oneplus_msm8998 kernel_samsung_smdk4412 kernel_xiaomi_sdm845";
+	startPatcher "kernel_asus_fugu kernel_asus_msm8953 kernel_cyanogen_msm8916 kernel_cyanogen_msm8974 kernel_google_yellowstone kernel_lge_hammerhead kernel_oneplus_msm8998 kernel_xiaomi_sdm845";
 }
 export -f patchAllKernels;
 
@@ -60,7 +60,7 @@ buildAll() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi;
 	if [ "$DOS_OPTIMIZE_IMAGES" = true ]; then optimizeImagesRecursive "$DOS_BUILD_BASE"; fi;
 	#SD800
-	buildDevice hammerhead; #broken sepolicy?
+	buildDevice hammerhead; #broken Bluetooth + maybe broken sepolicy
 	#SD801
 	buildDevice ham;
 	#SD615
@@ -68,12 +68,10 @@ buildAll() {
 	#SD625
 	buildDevice zenfone3; #broken - ninja: error: 'android.hidl.base@1.0.so', missing and no known rule to make it
 	#SD835
-	buildDevice cheeseburger verity; #needs manual patching - vendor common makefile #17.1 isn't booting
+	buildDevice cheeseburger verity; #needs manual patching - vendor common makefile + 17.1 isn't booting
 	buildDevice dumpling verity;
 	#SD845
 	buildDevice beryllium;
-	#Exynos
-	buildDeviceUserDebug i9100; #broken - many errors in hardware/samsung/exynos4
 	#Intel
 	buildDevice fugu; #broken - ninja: error: 'libpcre2.so' missing and no known rule to make it
 	#Tegra