From ada6a39de058d744cc1c49665ba20cf7f58b9b91 Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Tue, 22 Oct 2019 14:19:17 +0100 Subject: [PATCH] ANDROID: quilt series: add missing ANDROID: tags Change-Id: Icaf0ad10a2552a1e7c69f9e21841d84205a7b41e Signed-off-by: Matthias Maennich --- ...d-an-IOCTL-to-check-ION-ABI-version.patch} | 2 +- ...ID-Adding-GKI-Ramdisk-to-gki-config.patch} | 2 +- ...ng-SERIAL_OF_PLATFORM-module-to-gki.patch} | 2 +- ...MMC-m.patch => ANDROID-CONFIG_MMC-m.patch} | 2 +- ...DROID-Enable-CONFIG_ION_SYSTEM_HEAP.patch} | 2 +- ...s-make-headers-archive-reproducible.patch} | 2 +- ...irq-don-t-set-the-chip-for-all-irqs.patch} | 2 +- ...move-uses-of-variable-length-arrays.patch} | 2 +- ...d-of-the-kernel-area-to-be-reserved.patch} | 3 +- ...-pre-and-post-change-rate-callbacks.patch} | 2 +- ...defconfig-Enable-CONFIG_DM_SNAPSHOT.patch} | 2 +- ...-ion-heaps-into-their-own-directory.patch} | 2 +- ...g-ion-export-ion_free-for-ion_heaps.patch} | 2 +- ...n-fix-off-by-1-error-in-heap-search.patch} | 2 +- ...ake-system-and-contig-heaps-modular.patch} | 2 +- ...r-manipulators-into-a-separate-file.patch} | 4 +- ...f-manipulators-into-a-separate-file.patch} | 4 +- ...tor-ion-s-heap-API-into-linux-ion.h.patch} | 2 +- ...p-manipulators-into-a-separate-file.patch} | 3 +- ...plit-system-and-system-contig-heaps.patch} | 2 +- ...-match-the-existing-heap-type-enums.patch} | 2 +- patches/series | 42 +++++++++---------- 22 files changed, 46 insertions(+), 44 deletions(-) rename patches/{Add-an-IOCTL-to-check-ION-ABI-version.patch => ANDROID-Add-an-IOCTL-to-check-ION-ABI-version.patch} (97%) rename patches/{Adding-GKI-Ramdisk-to-gki-config.patch => ANDROID-Adding-GKI-Ramdisk-to-gki-config.patch} (94%) rename patches/{Adding-SERIAL_OF_PLATFORM-module-to-gki.patch => ANDROID-Adding-SERIAL_OF_PLATFORM-module-to-gki.patch} (96%) rename patches/{CONFIG_MMC-m.patch => ANDROID-CONFIG_MMC-m.patch} (98%) rename patches/{Enable-CONFIG_ION_SYSTEM_HEAP.patch => ANDROID-Enable-CONFIG_ION_SYSTEM_HEAP.patch} (96%) rename patches/{Revert-kheaders-make-headers-archive-reproducible.patch => ANDROID-Revert-kheaders-make-headers-archive-reproducible.patch} (97%) rename patches/{Revert-um-irq-don-t-set-the-chip-for-all-irqs.patch => ANDROID-Revert-um-irq-don-t-set-the-chip-for-all-irqs.patch} (93%) rename patches/{Revert-um-remove-uses-of-variable-length-arrays.patch => ANDROID-Revert-um-remove-uses-of-variable-length-arrays.patch} (97%) rename patches/{Revert-x86-mm-Identify-the-end-of-the-kernel-area-to-be-reserved.patch => ANDROID-Revert-x86-mm-Identify-the-end-of-the-kernel-area-to-be-reserved.patch} (96%) rename patches/{clk-add-pre-and-post-change-rate-callbacks.patch => ANDROID-clk-add-pre-and-post-change-rate-callbacks.patch} (98%) rename patches/{gki_defconfig-Enable-CONFIG_DM_SNAPSHOT.patch => ANDROID-gki_defconfig-Enable-CONFIG_DM_SNAPSHOT.patch} (95%) rename patches/{staging-ion-Move-ion-heaps-into-their-own-directory.patch => ANDROID-staging-ion-Move-ion-heaps-into-their-own-directory.patch} (98%) rename patches/{staging-ion-export-ion_free-for-ion_heaps.patch => ANDROID-staging-ion-export-ion_free-for-ion_heaps.patch} (96%) rename patches/{staging-ion-fix-off-by-1-error-in-heap-search.patch => ANDROID-staging-ion-fix-off-by-1-error-in-heap-search.patch} (94%) rename patches/{staging-ion-make-system-and-contig-heaps-modular.patch => ANDROID-staging-ion-make-system-and-contig-heaps-modular.patch} (99%) rename patches/{staging-ion-refactor-ion-s-buffer-manipulators-into-a-separate-file.patch => ANDROID-staging-ion-refactor-ion-s-buffer-manipulators-into-a-separate-file.patch} (99%) rename patches/{staging-ion-refactor-ion-s-dmabuf-manipulators-into-a-separate-file.patch => ANDROID-staging-ion-refactor-ion-s-dmabuf-manipulators-into-a-separate-file.patch} (99%) rename patches/{staging-ion-refactor-ion-s-heap-API-into-linux-ion.h.patch => ANDROID-staging-ion-refactor-ion-s-heap-API-into-linux-ion.h.patch} (99%) rename patches/{staging-ion-refactor-ion-s-heap-manipulators-into-a-separate-file.patch => ANDROID-staging-ion-refactor-ion-s-heap-manipulators-into-a-separate-file.patch} (99%) rename patches/{staging-ion-split-system-and-system-contig-heaps.patch => ANDROID-staging-ion-split-system-and-system-contig-heaps.patch} (99%) rename patches/{staging-ion-uapi-match-the-existing-heap-type-enums.patch => ANDROID-staging-ion-uapi-match-the-existing-heap-type-enums.patch} (95%) diff --git a/patches/Add-an-IOCTL-to-check-ION-ABI-version.patch b/patches/ANDROID-Add-an-IOCTL-to-check-ION-ABI-version.patch similarity index 97% rename from patches/Add-an-IOCTL-to-check-ION-ABI-version.patch rename to patches/ANDROID-Add-an-IOCTL-to-check-ION-ABI-version.patch index 365d1c77286c..bbf4b8f97a65 100644 --- a/patches/Add-an-IOCTL-to-check-ION-ABI-version.patch +++ b/patches/ANDROID-Add-an-IOCTL-to-check-ION-ABI-version.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Wed, 2 Oct 2019 14:32:19 -0700 -Subject: Add an IOCTL to check ION ABI version +Subject: ANDROID: Add an IOCTL to check ION ABI version Userspace needs a way to detect ION ABI version at runtime to determine heap IDs. CURRENT_ION_ABI_VERSION is set to 2 considering legacy and diff --git a/patches/Adding-GKI-Ramdisk-to-gki-config.patch b/patches/ANDROID-Adding-GKI-Ramdisk-to-gki-config.patch similarity index 94% rename from patches/Adding-GKI-Ramdisk-to-gki-config.patch rename to patches/ANDROID-Adding-GKI-Ramdisk-to-gki-config.patch index f827d0221fd5..6b4cd338f73d 100644 --- a/patches/Adding-GKI-Ramdisk-to-gki-config.patch +++ b/patches/ANDROID-Adding-GKI-Ramdisk-to-gki-config.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ram Muthiah Date: Tue, 13 Aug 2019 10:11:28 -0700 -Subject: Adding GKI Ramdisk to gki config +Subject: ANDROID: Adding GKI Ramdisk to gki config Test: Treehugger Bug: 132629930 diff --git a/patches/Adding-SERIAL_OF_PLATFORM-module-to-gki.patch b/patches/ANDROID-Adding-SERIAL_OF_PLATFORM-module-to-gki.patch similarity index 96% rename from patches/Adding-SERIAL_OF_PLATFORM-module-to-gki.patch rename to patches/ANDROID-Adding-SERIAL_OF_PLATFORM-module-to-gki.patch index bb2ebc1b8de6..7bc37b983f99 100644 --- a/patches/Adding-SERIAL_OF_PLATFORM-module-to-gki.patch +++ b/patches/ANDROID-Adding-SERIAL_OF_PLATFORM-module-to-gki.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ram Muthiah Date: Wed, 4 Sep 2019 16:18:17 -0700 -Subject: Adding SERIAL_OF_PLATFORM module to gki +Subject: ANDROID: Adding SERIAL_OF_PLATFORM module to gki Bug: 132629930 Change-Id: I722540edb8b7a7289e45e63de2959399cb563e23 diff --git a/patches/CONFIG_MMC-m.patch b/patches/ANDROID-CONFIG_MMC-m.patch similarity index 98% rename from patches/CONFIG_MMC-m.patch rename to patches/ANDROID-CONFIG_MMC-m.patch index 78f70797eae2..228f12394bbd 100644 --- a/patches/CONFIG_MMC-m.patch +++ b/patches/ANDROID-CONFIG_MMC-m.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Thu, 12 Sep 2019 14:06:44 -0700 -Subject: CONFIG_MMC=m +Subject: ANDROID: CONFIG_MMC=m Signed-off-by: Mark Salyzyn Test: compile diff --git a/patches/Enable-CONFIG_ION_SYSTEM_HEAP.patch b/patches/ANDROID-Enable-CONFIG_ION_SYSTEM_HEAP.patch similarity index 96% rename from patches/Enable-CONFIG_ION_SYSTEM_HEAP.patch rename to patches/ANDROID-Enable-CONFIG_ION_SYSTEM_HEAP.patch index 9cf281695436..eac716d15dfa 100644 --- a/patches/Enable-CONFIG_ION_SYSTEM_HEAP.patch +++ b/patches/ANDROID-Enable-CONFIG_ION_SYSTEM_HEAP.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Jorge E. Moreira" Date: Thu, 23 May 2019 17:26:51 -0700 -Subject: Enable CONFIG_ION_SYSTEM_HEAP +Subject: ANDROID: Enable CONFIG_ION_SYSTEM_HEAP Bug: 132983011 Test: atest MediaStore_Video_ThumbnailsTest diff --git a/patches/Revert-kheaders-make-headers-archive-reproducible.patch b/patches/ANDROID-Revert-kheaders-make-headers-archive-reproducible.patch similarity index 97% rename from patches/Revert-kheaders-make-headers-archive-reproducible.patch rename to patches/ANDROID-Revert-kheaders-make-headers-archive-reproducible.patch index a01616bd235d..48f55767efb5 100644 --- a/patches/Revert-kheaders-make-headers-archive-reproducible.patch +++ b/patches/ANDROID-Revert-kheaders-make-headers-archive-reproducible.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Wed, 9 Oct 2019 15:25:35 -0400 -Subject: Revert "kheaders: make headers archive reproducible" +Subject: ANDROID: Revert "kheaders: make headers archive reproducible" This reverts commit 86cdd2fdc4e39c388d39c7ba2396d1a9dfd66226. diff --git a/patches/Revert-um-irq-don-t-set-the-chip-for-all-irqs.patch b/patches/ANDROID-Revert-um-irq-don-t-set-the-chip-for-all-irqs.patch similarity index 93% rename from patches/Revert-um-irq-don-t-set-the-chip-for-all-irqs.patch rename to patches/ANDROID-Revert-um-irq-don-t-set-the-chip-for-all-irqs.patch index 703331865f72..eba9c507a494 100644 --- a/patches/Revert-um-irq-don-t-set-the-chip-for-all-irqs.patch +++ b/patches/ANDROID-Revert-um-irq-don-t-set-the-chip-for-all-irqs.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Thu, 22 Aug 2019 16:53:19 -0700 -Subject: Revert "um: irq: don't set the chip for all irqs" +Subject: ANDROID: Revert "um: irq: don't set the chip for all irqs" This reverts commit 1987b1b8f9f17a06255877e7917d0bb5b5377774. diff --git a/patches/Revert-um-remove-uses-of-variable-length-arrays.patch b/patches/ANDROID-Revert-um-remove-uses-of-variable-length-arrays.patch similarity index 97% rename from patches/Revert-um-remove-uses-of-variable-length-arrays.patch rename to patches/ANDROID-Revert-um-remove-uses-of-variable-length-arrays.patch index 77b7d930a828..fa51a69e28fb 100644 --- a/patches/Revert-um-remove-uses-of-variable-length-arrays.patch +++ b/patches/ANDROID-Revert-um-remove-uses-of-variable-length-arrays.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Thu, 22 Aug 2019 16:53:55 -0700 -Subject: Revert "um: remove uses of variable length arrays" +Subject: ANDROID: Revert "um: remove uses of variable length arrays" This reverts commit 0d4e5ac7e78035950d564e65c38ce148cb9af681. diff --git a/patches/Revert-x86-mm-Identify-the-end-of-the-kernel-area-to-be-reserved.patch b/patches/ANDROID-Revert-x86-mm-Identify-the-end-of-the-kernel-area-to-be-reserved.patch similarity index 96% rename from patches/Revert-x86-mm-Identify-the-end-of-the-kernel-area-to-be-reserved.patch rename to patches/ANDROID-Revert-x86-mm-Identify-the-end-of-the-kernel-area-to-be-reserved.patch index d6da46529fff..a544d46251d7 100644 --- a/patches/Revert-x86-mm-Identify-the-end-of-the-kernel-area-to-be-reserved.patch +++ b/patches/ANDROID-Revert-x86-mm-Identify-the-end-of-the-kernel-area-to-be-reserved.patch @@ -1,7 +1,8 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 23 Jul 2019 14:52:18 +0200 -Subject: Revert "x86/mm: Identify the end of the kernel area to be reserved" +Subject: ANDROID: Revert "x86/mm: Identify the end of the kernel area to be + reserved" This reverts commit c603a309cc75f3dd018ddb20ee44c05047918cbf. diff --git a/patches/clk-add-pre-and-post-change-rate-callbacks.patch b/patches/ANDROID-clk-add-pre-and-post-change-rate-callbacks.patch similarity index 98% rename from patches/clk-add-pre-and-post-change-rate-callbacks.patch rename to patches/ANDROID-clk-add-pre-and-post-change-rate-callbacks.patch index 9ae7da67c9cd..9227eae53b85 100644 --- a/patches/clk-add-pre-and-post-change-rate-callbacks.patch +++ b/patches/ANDROID-clk-add-pre-and-post-change-rate-callbacks.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: David Dai Date: Mon, 19 Aug 2019 16:35:44 -0700 -Subject: clk: add pre and post change rate callbacks +Subject: ANDROID: clk: add pre and post change rate callbacks There are scenarios where a rate change could result in a configuration change for both the targeted clock and its parent. diff --git a/patches/gki_defconfig-Enable-CONFIG_DM_SNAPSHOT.patch b/patches/ANDROID-gki_defconfig-Enable-CONFIG_DM_SNAPSHOT.patch similarity index 95% rename from patches/gki_defconfig-Enable-CONFIG_DM_SNAPSHOT.patch rename to patches/ANDROID-gki_defconfig-Enable-CONFIG_DM_SNAPSHOT.patch index aa4a83ba0848..b16aacf1a6a9 100644 --- a/patches/gki_defconfig-Enable-CONFIG_DM_SNAPSHOT.patch +++ b/patches/ANDROID-gki_defconfig-Enable-CONFIG_DM_SNAPSHOT.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alessio Balsini Date: Fri, 11 Oct 2019 13:50:20 +0100 -Subject: gki_defconfig: Enable CONFIG_DM_SNAPSHOT +Subject: ANDROID: gki_defconfig: Enable CONFIG_DM_SNAPSHOT The snapshot dm target is required to implement the Virtual-AB mechanism. diff --git a/patches/staging-ion-Move-ion-heaps-into-their-own-directory.patch b/patches/ANDROID-staging-ion-Move-ion-heaps-into-their-own-directory.patch similarity index 98% rename from patches/staging-ion-Move-ion-heaps-into-their-own-directory.patch rename to patches/ANDROID-staging-ion-Move-ion-heaps-into-their-own-directory.patch index 164b7c85668b..a4f3e0d0556b 100644 --- a/patches/staging-ion-Move-ion-heaps-into-their-own-directory.patch +++ b/patches/ANDROID-staging-ion-Move-ion-heaps-into-their-own-directory.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sandeep Patil Date: Thu, 8 Aug 2019 08:00:53 -0700 -Subject: staging: ion: Move ion heaps into their own directory +Subject: ANDROID: staging: ion: Move ion heaps into their own directory This is preparatory work for ION heaps to be kernel modules, so they stay in their own directory inside ION. The heap modules are diff --git a/patches/staging-ion-export-ion_free-for-ion_heaps.patch b/patches/ANDROID-staging-ion-export-ion_free-for-ion_heaps.patch similarity index 96% rename from patches/staging-ion-export-ion_free-for-ion_heaps.patch rename to patches/ANDROID-staging-ion-export-ion_free-for-ion_heaps.patch index 84475ea3f9ea..4ede4c8a29d1 100644 --- a/patches/staging-ion-export-ion_free-for-ion_heaps.patch +++ b/patches/ANDROID-staging-ion-export-ion_free-for-ion_heaps.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sandeep Patil Date: Tue, 10 Sep 2019 05:13:51 -0700 -Subject: staging: ion: export ion_free() for ion_heaps. +Subject: ANDROID: staging: ion: export ion_free() for ion_heaps. ion_free() is a generic function needed to release an ion buffer back to the heap. So, export it for the diff --git a/patches/staging-ion-fix-off-by-1-error-in-heap-search.patch b/patches/ANDROID-staging-ion-fix-off-by-1-error-in-heap-search.patch similarity index 94% rename from patches/staging-ion-fix-off-by-1-error-in-heap-search.patch rename to patches/ANDROID-staging-ion-fix-off-by-1-error-in-heap-search.patch index 00e130c2ef12..cb66ae6b3168 100644 --- a/patches/staging-ion-fix-off-by-1-error-in-heap-search.patch +++ b/patches/ANDROID-staging-ion-fix-off-by-1-error-in-heap-search.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sandeep Patil Date: Mon, 9 Sep 2019 08:21:20 -0700 -Subject: staging: ion: fix off-by-1 error in heap search +Subject: ANDROID: staging: ion: fix off-by-1 error in heap search ion allocation was wrong because of an off-by-1 error in heap search for buffer allocation. Fix it. diff --git a/patches/staging-ion-make-system-and-contig-heaps-modular.patch b/patches/ANDROID-staging-ion-make-system-and-contig-heaps-modular.patch similarity index 99% rename from patches/staging-ion-make-system-and-contig-heaps-modular.patch rename to patches/ANDROID-staging-ion-make-system-and-contig-heaps-modular.patch index 8fcb1743671d..833b0c6ea2c1 100644 --- a/patches/staging-ion-make-system-and-contig-heaps-modular.patch +++ b/patches/ANDROID-staging-ion-make-system-and-contig-heaps-modular.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sandeep Patil Date: Mon, 12 Aug 2019 17:23:25 -0700 -Subject: staging: ion: make system and contig heaps modular +Subject: ANDROID: staging: ion: make system and contig heaps modular Add symmetric heap add/remove APIs and export symbols from ion core that are needed to make both heaps modular. diff --git a/patches/staging-ion-refactor-ion-s-buffer-manipulators-into-a-separate-file.patch b/patches/ANDROID-staging-ion-refactor-ion-s-buffer-manipulators-into-a-separate-file.patch similarity index 99% rename from patches/staging-ion-refactor-ion-s-buffer-manipulators-into-a-separate-file.patch rename to patches/ANDROID-staging-ion-refactor-ion-s-buffer-manipulators-into-a-separate-file.patch index 8a99063e2a35..3a7c17e3a2ec 100644 --- a/patches/staging-ion-refactor-ion-s-buffer-manipulators-into-a-separate-file.patch +++ b/patches/ANDROID-staging-ion-refactor-ion-s-buffer-manipulators-into-a-separate-file.patch @@ -1,8 +1,8 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sandeep Patil Date: Wed, 7 Aug 2019 12:12:47 -0700 -Subject: staging: ion: refactor ion's buffer manipulators into a separate - file. +Subject: ANDROID: staging: ion: refactor ion's buffer manipulators into a + separate file. This patch is preparatory work for making ion heaps modular. The patch itself doesn't make any significant changes except for re-organizing the diff --git a/patches/staging-ion-refactor-ion-s-dmabuf-manipulators-into-a-separate-file.patch b/patches/ANDROID-staging-ion-refactor-ion-s-dmabuf-manipulators-into-a-separate-file.patch similarity index 99% rename from patches/staging-ion-refactor-ion-s-dmabuf-manipulators-into-a-separate-file.patch rename to patches/ANDROID-staging-ion-refactor-ion-s-dmabuf-manipulators-into-a-separate-file.patch index 3b6e965352bf..d4666692f175 100644 --- a/patches/staging-ion-refactor-ion-s-dmabuf-manipulators-into-a-separate-file.patch +++ b/patches/ANDROID-staging-ion-refactor-ion-s-dmabuf-manipulators-into-a-separate-file.patch @@ -1,8 +1,8 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sandeep Patil Date: Wed, 7 Aug 2019 15:01:24 -0700 -Subject: staging: ion: refactor ion's dmabuf manipulators into a separate - file. +Subject: ANDROID: staging: ion: refactor ion's dmabuf manipulators into a + separate file. This patch is preparatory work for making ion heaps modular. The patch itself doesn't make any significant changes except for re-organizing the diff --git a/patches/staging-ion-refactor-ion-s-heap-API-into-linux-ion.h.patch b/patches/ANDROID-staging-ion-refactor-ion-s-heap-API-into-linux-ion.h.patch similarity index 99% rename from patches/staging-ion-refactor-ion-s-heap-API-into-linux-ion.h.patch rename to patches/ANDROID-staging-ion-refactor-ion-s-heap-API-into-linux-ion.h.patch index 296d9b181869..00a9df0371e5 100644 --- a/patches/staging-ion-refactor-ion-s-heap-API-into-linux-ion.h.patch +++ b/patches/ANDROID-staging-ion-refactor-ion-s-heap-API-into-linux-ion.h.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sandeep Patil Date: Thu, 8 Aug 2019 08:35:46 -0700 -Subject: staging: ion: refactor ion's heap API into linux/ion.h +Subject: ANDROID: staging: ion: refactor ion's heap API into linux/ion.h Now that we know the APIs needed by system and cma heaps, refactor and move all those into linux/ion.h. diff --git a/patches/staging-ion-refactor-ion-s-heap-manipulators-into-a-separate-file.patch b/patches/ANDROID-staging-ion-refactor-ion-s-heap-manipulators-into-a-separate-file.patch similarity index 99% rename from patches/staging-ion-refactor-ion-s-heap-manipulators-into-a-separate-file.patch rename to patches/ANDROID-staging-ion-refactor-ion-s-heap-manipulators-into-a-separate-file.patch index 0ba6a37a4aaa..195ffb58c615 100644 --- a/patches/staging-ion-refactor-ion-s-heap-manipulators-into-a-separate-file.patch +++ b/patches/ANDROID-staging-ion-refactor-ion-s-heap-manipulators-into-a-separate-file.patch @@ -1,7 +1,8 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sandeep Patil Date: Thu, 8 Aug 2019 07:52:27 -0700 -Subject: staging: ion: refactor ion's heap manipulators into a separate file. +Subject: ANDROID: staging: ion: refactor ion's heap manipulators into a + separate file. This patch is preparatory work for making ion heaps modular. The patch itself doesn't make any significant changes except for re-organizing the diff --git a/patches/staging-ion-split-system-and-system-contig-heaps.patch b/patches/ANDROID-staging-ion-split-system-and-system-contig-heaps.patch similarity index 99% rename from patches/staging-ion-split-system-and-system-contig-heaps.patch rename to patches/ANDROID-staging-ion-split-system-and-system-contig-heaps.patch index 4933e1f7193d..cc52e3510e35 100644 --- a/patches/staging-ion-split-system-and-system-contig-heaps.patch +++ b/patches/ANDROID-staging-ion-split-system-and-system-contig-heaps.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sandeep Patil Date: Thu, 8 Aug 2019 08:50:56 -0700 -Subject: staging: ion: split system and system-contig heaps +Subject: ANDROID: staging: ion: split system and system-contig heaps This will allows us to build and load them both as individual kernel modules. diff --git a/patches/staging-ion-uapi-match-the-existing-heap-type-enums.patch b/patches/ANDROID-staging-ion-uapi-match-the-existing-heap-type-enums.patch similarity index 95% rename from patches/staging-ion-uapi-match-the-existing-heap-type-enums.patch rename to patches/ANDROID-staging-ion-uapi-match-the-existing-heap-type-enums.patch index b874ab38f6f5..20602bd7e258 100644 --- a/patches/staging-ion-uapi-match-the-existing-heap-type-enums.patch +++ b/patches/ANDROID-staging-ion-uapi-match-the-existing-heap-type-enums.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sandeep Patil Date: Mon, 9 Sep 2019 08:34:43 -0700 -Subject: staging: ion: uapi: match the existing heap type enums +Subject: ANDROID: staging: ion: uapi: match the existing heap type enums Change the enup order for ion heap types to match how it was before so as to not break any userspace code that depends on them. diff --git a/patches/series b/patches/series index d1af452c50ca..18e4d096112c 100644 --- a/patches/series +++ b/patches/series @@ -98,7 +98,7 @@ ANDROID-Four-part-revert-of-asm-goto-usage-4-4.patch ANDROID-Removed-check-for-asm-goto.patch ANDROID-Add-initial-x86_64-gki_defconfig.patch ANDROID-added-configs-so-that-GKI-boots-on-x86-cuttlefish.patch -Enable-CONFIG_ION_SYSTEM_HEAP.patch +ANDROID-Enable-CONFIG_ION_SYSTEM_HEAP.patch ANDROID-gki_defconfig-enable-CMA-and-increase-CMA_AREAS.patch ANDROID-gki_defconfig-enable-SLAB_FREELIST_RANDOM-SLAB_FREELIST_HARDENED.patch ANDROID-gki_defconfig-Enable-CMA-SLAB_FREELIST-RANDOM-and-HARDENED-on-x86.patch @@ -124,7 +124,7 @@ ANDROID-sdcardfs-Add-sdcardfs-filesystem.patch ANDROID-cuttlefish-gki-_defconfig-Enable-CONFIG_SDCARD_FS.patch ANDROID-mnt-Fix-null-pointer-dereference.patch ANDROID-build-configs-switch-prebuilt-path-location.patch -Revert-x86-mm-Identify-the-end-of-the-kernel-area-to-be-reserved.patch +ANDROID-Revert-x86-mm-Identify-the-end-of-the-kernel-area-to-be-reserved.patch ANDROID-xfrm-remove-in_compat_syscall-checks.patch ANDROID-Add-initial-rockpi4_defconfig.patch ANDROID-label-cuttlefish-modules-for-gki.patch @@ -136,21 +136,21 @@ ANDROID-dma-buf-Add-support-to-get-flags-associated-with-a-buffer.patch ANDROID-Removed-hardcoded-kernel-command-line-arguments.patch ANDROID-gki_defconfig-disable-IP_PNP-ECRYPT_FS.patch ANDROID-Removed-unnecessary-modules-from-cuttlefish.patch -Adding-GKI-Ramdisk-to-gki-config.patch +ANDROID-Adding-GKI-Ramdisk-to-gki-config.patch ANDROID-Remove-unused-cuttlefish-build-infra.patch -staging-ion-refactor-ion-s-buffer-manipulators-into-a-separate-file.patch -staging-ion-refactor-ion-s-dmabuf-manipulators-into-a-separate-file.patch -staging-ion-refactor-ion-s-heap-manipulators-into-a-separate-file.patch -staging-ion-Move-ion-heaps-into-their-own-directory.patch -staging-ion-refactor-ion-s-heap-API-into-linux-ion.h.patch -staging-ion-split-system-and-system-contig-heaps.patch -staging-ion-make-system-and-contig-heaps-modular.patch +ANDROID-staging-ion-refactor-ion-s-buffer-manipulators-into-a-separate-file.patch +ANDROID-staging-ion-refactor-ion-s-dmabuf-manipulators-into-a-separate-file.patch +ANDROID-staging-ion-refactor-ion-s-heap-manipulators-into-a-separate-file.patch +ANDROID-staging-ion-Move-ion-heaps-into-their-own-directory.patch +ANDROID-staging-ion-refactor-ion-s-heap-API-into-linux-ion.h.patch +ANDROID-staging-ion-split-system-and-system-contig-heaps.patch +ANDROID-staging-ion-make-system-and-contig-heaps-modular.patch ANDROID-staging-ion-Build-fix-for-mips.patch ANDROID-fix-kernelci-build-break.patch ANDROID-gki_defconfig-enable-CONFIG_TIPC.patch ANDROID-gki_defconfig-set-CONFIG_NR_CPUS-32.patch -Revert-um-irq-don-t-set-the-chip-for-all-irqs.patch -Revert-um-remove-uses-of-variable-length-arrays.patch +ANDROID-Revert-um-irq-don-t-set-the-chip-for-all-irqs.patch +ANDROID-Revert-um-remove-uses-of-variable-length-arrays.patch ANDROID-sdcardfs-fix-fall-through-in-param-parsing.patch ANDROID-gki_defconfig-Minimally-enable-EFI.patch ANDROID-gki_defconfig-enable-CONFIG_SPARSEMEM_VMEMMAP.patch @@ -167,14 +167,14 @@ ANDROID-GKI-enable-CONFIG_SPI-for-x86.patch ANDROID-GKI-enable-CONFIG_TIPC-for-x86.patch ANDROID-Catch-rockpi4_defconfig-up-with-gki_defconfig.patch ANDROID-first-pass-cuttlefish-GKI-modularization.patch -staging-ion-fix-off-by-1-error-in-heap-search.patch -staging-ion-uapi-match-the-existing-heap-type-enums.patch -staging-ion-export-ion_free-for-ion_heaps.patch +ANDROID-staging-ion-fix-off-by-1-error-in-heap-search.patch +ANDROID-staging-ion-uapi-match-the-existing-heap-type-enums.patch +ANDROID-staging-ion-export-ion_free-for-ion_heaps.patch ANDROID-cuttlefish-overlayfs-regression.patch -Adding-SERIAL_OF_PLATFORM-module-to-gki.patch +ANDROID-Adding-SERIAL_OF_PLATFORM-module-to-gki.patch ANDROID-Removed-extraneous-serial-8250-configs.patch ANDROID-Log-which-device-failed-to-suspend-in-dpm_suspend_start.patch -CONFIG_MMC-m.patch +ANDROID-CONFIG_MMC-m.patch ANDROID-gki_defconfig-enable-CONFIG_UIO.patch ANDROID-init-GKI-add-GKI_HACKS_TO_FIX.patch ANDROID-init-GKI-enable-hidden-configs-for-DRM.patch @@ -210,7 +210,7 @@ ANDROID-sched-core-Add-a-latency-sensitive-flag-to-uclamp.patch ANDROID-sched-Introduce-uclamp-latency-and-boost-wrapper.patch ANDROID-sched-fair-Bias-EAS-placement-for-latency.patch ANDROID-Initial-abi_gki_aarch64-definition.patch -Add-an-IOCTL-to-check-ION-ABI-version.patch +ANDROID-Add-an-IOCTL-to-check-ION-ABI-version.patch FROMGIT-driver-core-Add-fwnode_to_dev-to-look-up-device-from-fwnode.patch FROMGIT-driver-core-Add-support-for-linking-devices-during-device-addition.patch FROMGIT-of-property-Add-functional-dependency-link-from-DT-bindings.patch @@ -220,14 +220,14 @@ FROMGIT-of-property-Create-device-links-for-all-child-supplier-depencencies.patc ANDROID-gki_defconfig-Enable-BPF_JIT-and-BPF_JIT_ALWAYS_ON.patch ANDROID-gki_defconfig-enable-REGULATOR.patch ANDROID-gki_defconfig-enable-CONFIG_NLS_.patch -Revert-kheaders-make-headers-archive-reproducible.patch +ANDROID-Revert-kheaders-make-headers-archive-reproducible.patch ANDROID-staging-ion-fix-sparse-warning-in-ion-system-heap.patch ANDROID-gki_defconfig-enable-CONFIG_PARAVIRT-and-CONFIG_HYPERVISOR_GUEST.patch ANDROID-gki_defconfig-enable-accelerated-AES-and-SHA-256.patch ANDROID-gki_defconfig-enabled-CONFIG_TMPFS-explicitly.patch -gki_defconfig-Enable-CONFIG_DM_SNAPSHOT.patch +ANDROID-gki_defconfig-Enable-CONFIG_DM_SNAPSHOT.patch ANDROID-Fix-x86_64-allmodconfig-build.patch -clk-add-pre-and-post-change-rate-callbacks.patch +ANDROID-clk-add-pre-and-post-change-rate-callbacks.patch ANDROID-gki_defconfig-enable-fs-verity.patch UPSTREAM-base-soc-Handle-custom-soc-information-sysfs-entries.patch ANDROID-unconditionally-compile-sig_ok-in-struct-module.patch