GSI updates for system/vold
Change-Id: Ibfa6cc1ac825a35ec66a516f069d762a8c59ba37
diff --git a/patches/system/vold/0001-Don-t-set-reserved_disk-group-it-panics-old-inits.patch b/patches/system/vold/0001-Don-t-set-reserved_disk-group-it-panics-old-inits.patch
index 72841f7..d5fd0c2 100644
--- a/patches/system/vold/0001-Don-t-set-reserved_disk-group-it-panics-old-inits.patch
+++ b/patches/system/vold/0001-Don-t-set-reserved_disk-group-it-panics-old-inits.patch
@@ -1,10 +1,12 @@
-From d4c643a08e4f931d507fa6ade7c0b739cc110d15 Mon Sep 17 00:00:00 2001
+From 73a4350598cca23f83f1ae0e3153a63209aa7d44 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 14 Aug 2018 20:53:12 +0200
-Subject: [PATCH 1/8] Don't set reserved_disk group, it panics old inits
+Subject: [PATCH 1/4] Don't set reserved_disk group, it panics old inits
-Change-Id: I9fecd1e5187048e321af181921ecd7e37ca1eae9
-Signed-off-by: Jackeagle <jackeagle102@gmail.com>
+Conflicts:
+ vold.rc
+
+Change-Id: Icce2d35a462dfe5ea5f05b5616febb72ab28d83a
---
vold.rc | 1 -
1 file changed, 1 deletion(-)
diff --git a/patches/system/vold/0002-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch b/patches/system/vold/0002-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch
index bcaec3b..1829d1e 100644
--- a/patches/system/vold/0002-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch
+++ b/patches/system/vold/0002-Create-vendor_de.-This-is-done-by-init.rc-on-system-.patch
@@ -1,7 +1,7 @@
-From 5771cb8139323860f496a849d67502fc274da495 Mon Sep 17 00:00:00 2001
+From f93afbee37f5fa6ac16d451ded9e475b76d0d127 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 14 Aug 2018 20:54:08 +0200
-Subject: [PATCH 2/8] Create vendor_de. This is done by /init.rc on
+Subject: [PATCH 2/4] Create vendor_de. This is done by /init.rc on
system-as-root device
---
diff --git a/patches/system/vold/0003-Support-Samsung-s-implementation-of-exfat-called-sdf.patch b/patches/system/vold/0003-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
index 04a2bd6..96d1d00 100644
--- a/patches/system/vold/0003-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
+++ b/patches/system/vold/0003-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
@@ -1,7 +1,7 @@
-From bd92087dd58bfc2b5c52688b3f7f325cde7eca55 Mon Sep 17 00:00:00 2001
+From 3945b7da1af3b91d00543b15dd4d042db5bbae92 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 20 Aug 2018 22:37:54 +0200
-Subject: [PATCH 3/8] Support Samsung's implementation of exfat, called sdfat
+Subject: [PATCH 3/4] Support Samsung's implementation of exfat, called sdfat
---
fs/Exfat.cpp | 9 ++++++---
diff --git a/patches/system/vold/0004-Also-create-vendor_ce-same-reason-as-vendor_de.patch b/patches/system/vold/0004-Also-create-vendor_ce-same-reason-as-vendor_de.patch
index d29a6a8..27c3c64 100644
--- a/patches/system/vold/0004-Also-create-vendor_ce-same-reason-as-vendor_de.patch
+++ b/patches/system/vold/0004-Also-create-vendor_ce-same-reason-as-vendor_de.patch
@@ -1,7 +1,7 @@
-From 63c29054718759d24a43fadb8e3f68a409120502 Mon Sep 17 00:00:00 2001
+From b54608b7f7c3a16b03e1edd7cdabcb31f692c90b Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 20 Aug 2018 22:38:08 +0200
-Subject: [PATCH 4/8] Also create vendor_ce (same reason as vendor_de)
+Subject: [PATCH 4/4] Also create vendor_ce (same reason as vendor_de)
---
Ext4Crypt.cpp | 2 ++