From c3f480b867ea847da76986de5a49574364efde46 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Fri, 17 Aug 2018 19:22:00 -0400
Subject: [PATCH] Updates

---
 Patches/Linux                                                 | 2 +-
 Scripts/LineageOS-14.1/Functions.sh                           | 3 +--
 .../LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh  | 4 +---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Patches/Linux b/Patches/Linux
index 8a323253..1294b0dc 160000
--- a/Patches/Linux
+++ b/Patches/Linux
@@ -1 +1 @@
-Subproject commit 8a323253988b127b1666a7ac3e1c1a483e439596
+Subproject commit 1294b0dc36b570fa704038ecdb0a4f65b3707bdd
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 416f5306..c982eec0 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -95,8 +95,7 @@ export -f buildAll;
 
 patchWorkspace() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/cm"; fi;
-	source build/envsetup.sh;
-	repopick -t n_asb_08-2018;
+	#source build/envsetup.sh;
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS/Defaults.sh";
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh
index be5fd303..4001ec4e 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh
@@ -56,9 +56,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17558/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5972/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6345/^4.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8269/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9242/^4.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.10/0001.patch
@@ -66,5 +64,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p66"
+editKernelLocalversion "-dos.p64"
 cd "$DOS_BUILD_BASE"