Commit graph

1957 commits

Author SHA1 Message Date
Xin Li
98216c393b [automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: 943c41b573 -s ours am: 35f7412591 -s ours am: a98927cd39 -s ours
am skip reason: Merged-In I876267ab4e44083215ae313de5e4897b06e9ec49 with SHA-1 23acefc286 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/17805472

Change-Id: I1421e8c65995da86bd447b4b141d21a989a72498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 08:26:39 +00:00
Xin Li
a98927cd39 [automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: 943c41b573 -s ours am: 35f7412591 -s ours
am skip reason: Merged-In I876267ab4e44083215ae313de5e4897b06e9ec49 with SHA-1 23acefc286 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/17805472

Change-Id: I5f8c3ed5bbb8091c4e27611df7937dffcae32ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 05:55:46 +00:00
Xin Li
35f7412591 [automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: 943c41b573 -s ours
am skip reason: Merged-In I876267ab4e44083215ae313de5e4897b06e9ec49 with SHA-1 23acefc286 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/17805472

Change-Id: I46beb9fe95558984e611629fad66952c2743741c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 04:21:23 +00:00
Xin Li
943c41b573 Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047
Bug: 226662282
Merged-In: I876267ab4e44083215ae313de5e4897b06e9ec49
Change-Id: I60c26dfee259a132e24150108549848b50f93086
2022-04-18 20:43:36 +00:00
Cole Faust
e693d8c666 Convert kconfig_xml_fixup to python 3 am: 9cb0c67c72 am: b5867e2adf am: eb376fd02b am: 27873243a0
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2061123

Change-Id: Ie9712a0a4ef9e20ad8cc24badbf6b69a8560880b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 02:29:50 +00:00
Cole Faust
27873243a0 Convert kconfig_xml_fixup to python 3 am: 9cb0c67c72 am: b5867e2adf am: eb376fd02b
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2061123

Change-Id: I1187a30ce762a7b3de8aa7ab9c18035dcc3ca1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 01:28:38 +00:00
Cole Faust
eb376fd02b Convert kconfig_xml_fixup to python 3 am: 9cb0c67c72 am: b5867e2adf
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2061123

Change-Id: I4dea5e9a200b64511f37d041d252fbfd28a124b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 01:00:27 +00:00
Cole Faust
b5867e2adf Convert kconfig_xml_fixup to python 3 am: 9cb0c67c72
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2061123

Change-Id: I08a078a947955f2602eeb9e0660beae77798a306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 00:35:14 +00:00
Cole Faust
9cb0c67c72 Convert kconfig_xml_fixup to python 3
No changes were necessary, but since I noticed "die"
wasn't defined I removed usages of it.

Test: python3 ./tools/kconfig_xml_fixup.py --input android-5.15/android-base-conditional.xml --output-matrix ./outputmatrix --output-version ./outputversion
Bug: 203436762
Change-Id: I7a94c57c88b96aba393655151cc5e872953dee6e
2022-04-12 14:07:14 -07:00
Xin Li
eef9c8748d [automerger skipped] Mark ab/8389834 as merged am: 8f9c921f74 -s ours am: a69f1632c4 -s ours am: 917243e6ff -s ours am: 70271c3497 -s ours am: e738f94fc3 -s ours
am skip reason: Merged-In If26571c075946bbc3ca92dde9b4b813881365b26 with SHA-1 1c9d2751be is already in history

Original change: https://android-review.googlesource.com/c/kernel/configs/+/2052769

Change-Id: I68211a78f1089d781e9f1050d802bf74e56eb96a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 08:38:30 +00:00
Xin Li
e738f94fc3 [automerger skipped] Mark ab/8389834 as merged am: 8f9c921f74 -s ours am: a69f1632c4 -s ours am: 917243e6ff -s ours am: 70271c3497 -s ours
am skip reason: Merged-In If26571c075946bbc3ca92dde9b4b813881365b26 with SHA-1 1c9d2751be is already in history

Original change: https://android-review.googlesource.com/c/kernel/configs/+/2052769

Change-Id: I496c961aa3aa32a3e1ed7b86740a78eee20ab83f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:52:37 +00:00
Xin Li
70271c3497 [automerger skipped] Mark ab/8389834 as merged am: 8f9c921f74 -s ours am: a69f1632c4 -s ours am: 917243e6ff -s ours
am skip reason: Merged-In If26571c075946bbc3ca92dde9b4b813881365b26 with SHA-1 1c9d2751be is already in history

Original change: https://android-review.googlesource.com/c/kernel/configs/+/2052769

Change-Id: I3aede6920ec312df5fa4047de60fb2338160dd33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:20:56 +00:00
Xin Li
917243e6ff [automerger skipped] Mark ab/8389834 as merged am: 8f9c921f74 -s ours am: a69f1632c4 -s ours
am skip reason: Merged-In If26571c075946bbc3ca92dde9b4b813881365b26 with SHA-1 1c9d2751be is already in history

Original change: https://android-review.googlesource.com/c/kernel/configs/+/2052769

Change-Id: I06f6309b77380f6c02505a9c8dfd3275c1b6cb21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:06:04 +00:00
Xin Li
a69f1632c4 [automerger skipped] Mark ab/8389834 as merged am: 8f9c921f74 -s ours
am skip reason: Merged-In If26571c075946bbc3ca92dde9b4b813881365b26 with SHA-1 1c9d2751be is already in history

Original change: https://android-review.googlesource.com/c/kernel/configs/+/2052769

Change-Id: I173c28d4cc8e7ccecdb90d11b06889ba860b2229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 06:42:51 +00:00
Xin Li
8f9c921f74 Mark ab/8389834 as merged
Bug: 188847863
Merged-In: If26571c075946bbc3ca92dde9b4b813881365b26
Change-Id: Id187187103d146f0abb1a6e375488a2ba92ddf95
2022-04-01 00:16:12 -07:00
Xin Li
ae50de8c5d [automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: e7d59551e2 -s ours am: 94350db217 -s ours
am skip reason: Merged-In Ib0b4c1d51333bba7ab989efd911c0783febb78d6 with SHA-1 dd46951e69 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/16843649

Change-Id: Ia92b21aa9a05e65f5319001f43f149f43fc09e46
2022-02-11 20:47:20 +00:00
Xin Li
94350db217 [automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: e7d59551e2 -s ours
am skip reason: Merged-In Ib0b4c1d51333bba7ab989efd911c0783febb78d6 with SHA-1 dd46951e69 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/16843649

Change-Id: I60cb888e720c31ce63216ff555f52a446b087734
2022-02-11 20:23:17 +00:00
Xin Li
e7d59551e2 Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: Ib0b4c1d51333bba7ab989efd911c0783febb78d6
Change-Id: Ic92c1ed88c5a7755eff0d09b6b880d54f3462649
2022-02-11 06:15:51 +00:00
Alexander Potapenko
ba797c07b0 Merge "Require CONFIG_INIT_STACK_ALL_ZERO on arches that support it" am: 4ca2ff98bf am: 9d91925e45 am: 82187f9b33 am: 7a72153fc0
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1972679

Change-Id: I9dfe4a0eca28be0afac3a47116ea1471aa4ed2ae
2022-02-07 19:55:24 +00:00
Alexander Potapenko
7a72153fc0 Merge "Require CONFIG_INIT_STACK_ALL_ZERO on arches that support it" am: 4ca2ff98bf am: 9d91925e45 am: 82187f9b33
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1972679

Change-Id: I0bc14850c1ebf1d460d24c0b57a658cb96422256
2022-02-07 19:37:52 +00:00
Alexander Potapenko
82187f9b33 Merge "Require CONFIG_INIT_STACK_ALL_ZERO on arches that support it" am: 4ca2ff98bf am: 9d91925e45
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1972679

Change-Id: Ibc4fe16a0111a629a9c5e0dec72f397032bf1005
2022-02-07 19:25:59 +00:00
Alexander Potapenko
9d91925e45 Merge "Require CONFIG_INIT_STACK_ALL_ZERO on arches that support it" am: 4ca2ff98bf
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1972679

Change-Id: I5965804a34fcf6469b76b5870c2bc53787907a0d
2022-02-07 19:09:06 +00:00
Alexander Potapenko
4ca2ff98bf Merge "Require CONFIG_INIT_STACK_ALL_ZERO on arches that support it" 2022-02-07 18:55:16 +00:00
Jeff Vander Stoep
8bd8d7083b Disable CONFIG_VMAP_STACK for KASAN builds am: 23acefc286 am: 7425df250d am: 85563c35e9 am: 5c3e2f4d00
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1974459

Change-Id: I6c88b2e42409ea02771af4135d8fa85058e38f31
2022-02-07 17:04:43 +00:00
Jeff Vander Stoep
5c3e2f4d00 Disable CONFIG_VMAP_STACK for KASAN builds am: 23acefc286 am: 7425df250d am: 85563c35e9
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1974459

Change-Id: I074736e30b19ca54ad3a9f8fbecf01701022ea14
2022-02-07 16:50:44 +00:00
Jeff Vander Stoep
85563c35e9 Disable CONFIG_VMAP_STACK for KASAN builds am: 23acefc286 am: 7425df250d
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1974459

Change-Id: Ic2e419ebe4db8fa4797de685502144e6da4dd25a
2022-02-07 16:34:53 +00:00
Jeff Vander Stoep
7425df250d Disable CONFIG_VMAP_STACK for KASAN builds am: 23acefc286
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1974459

Change-Id: I881ef6a3406f34b64f78dce642e7bcefd56ea992
2022-02-07 16:18:11 +00:00
Jeff Vander Stoep
23acefc286 Disable CONFIG_VMAP_STACK for KASAN builds
Test: treehugger
Bug: 117194687
Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
Change-Id: I876267ab4e44083215ae313de5e4897b06e9ec49
2022-02-07 10:53:11 +00:00
Alexander Potapenko
d8cafe2a98 Require CONFIG_INIT_STACK_ALL_ZERO on arches that support it
CONFIG_INIT_STACK_ALL_ZERO minimizes the effect of bugs caused by uninitialized locals, so we want to prevent it from being accidentally disabled.

Bug: 204439281
Bug: 205279854
Test: TreeHugger
Change-Id: I2014cd9bc2e3ebb8442ccc632c82619d62645dd4
2022-02-04 18:27:47 +00:00
Treehugger Robot
6179944ae7 Merge "Require CONFIG_VMAP_STACK on arches that support it" am: c9727b8ce3 am: 33acbc7246 am: 609d5a9d00 am: f32dd8c8e5
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1958799

Change-Id: Ie21721fb4d31812e27d5847f4244dfec227f8014
2022-01-31 11:24:10 +00:00
Treehugger Robot
f32dd8c8e5 Merge "Require CONFIG_VMAP_STACK on arches that support it" am: c9727b8ce3 am: 33acbc7246 am: 609d5a9d00
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1958799

Change-Id: I7cc5396df8ca3b8a7b2d581492a91141bfaac78c
2022-01-31 10:55:35 +00:00
Treehugger Robot
609d5a9d00 Merge "Require CONFIG_VMAP_STACK on arches that support it" am: c9727b8ce3 am: 33acbc7246
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1958799

Change-Id: Ifc37ff0fbfde1868fd0734a7dc560b91a513b619
2022-01-31 10:41:07 +00:00
Treehugger Robot
33acbc7246 Merge "Require CONFIG_VMAP_STACK on arches that support it" am: c9727b8ce3
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1958799

Change-Id: If1fb98c238286b6bf93c300b295d6b0203c41268
2022-01-31 10:24:30 +00:00
Treehugger Robot
c9727b8ce3 Merge "Require CONFIG_VMAP_STACK on arches that support it" 2022-01-31 10:04:00 +00:00
Bob Badour
c9fa4b2223 Fix licenses and license texts. am: 8e30736b3d am: 077b04892f am: ca378ac516 am: 5127b1fae6
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1959761

Change-Id: I0521d2a1e74d9ed8383bc92796f201b3fc5b4185
2022-01-26 20:30:04 +00:00
Bob Badour
5127b1fae6 Fix licenses and license texts. am: 8e30736b3d am: 077b04892f am: ca378ac516
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1959761

Change-Id: I67419235edd037283a7042f8bf56f6ad65191b79
2022-01-26 20:16:24 +00:00
Bob Badour
ca378ac516 Fix licenses and license texts. am: 8e30736b3d am: 077b04892f
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1959761

Change-Id: I4fddcb0e6c9877159954707d6704c2b11b17d574
2022-01-26 19:37:48 +00:00
Bob Badour
077b04892f Fix licenses and license texts. am: 8e30736b3d
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1959761

Change-Id: I28f2c751ee693ac924c4d5542b7d0353e5665243
2022-01-26 19:26:27 +00:00
Bob Badour
8e30736b3d Fix licenses and license texts.
No legacy_notice code remains. Everything appears to be Android 1p.

Test: m nothing
Change-Id: I25b66acf26102862e3e35ec72c2261b020df834e
2022-01-25 12:21:06 -08:00
Jeff Vander Stoep
5ef33e6af2 Require CONFIG_VMAP_STACK on arches that support it
Turns unbounded recursion in kernel code from being a potentially
exploitable bug into a crash.

This is likely a no-op. CONFIG_VMAP_STACK is already the default
on architectures that support it. CONFIG_VMAP_STACK has been
supported on x86_64 since 4.9 and on arm64 since 4.14. This change
is to prevent it from being accidentally disabled.

Test: On Pixel 5:
adb pull /proc/config.gz gunzip config.gz;
grep CONFIG_VMAP_STACK=y config
Bug: 117194687
Change-Id: I458d7a9d3a28b057b372a7456dbdeb3397423a15
Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
2022-01-24 17:44:55 +00:00
Nick Desaulniers
c6c70efafc Revert "Revert "Require clang be used to assemble the kernel"" am: 1ede69c685 am: 0ec72293c1 am: 3cce65bf01 am: cbec1626ae
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1950240

Change-Id: Ia851f6bf015756944ecb21e9091e833ca9c534a3
2022-01-17 21:42:10 +00:00
Nick Desaulniers
cbec1626ae Revert "Revert "Require clang be used to assemble the kernel"" am: 1ede69c685 am: 0ec72293c1 am: 3cce65bf01
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1950240

Change-Id: I6fe2a8ebfa0d502f3b417b9ce22ed3b708991fdd
2022-01-17 21:30:33 +00:00
Nick Desaulniers
3cce65bf01 Revert "Revert "Require clang be used to assemble the kernel"" am: 1ede69c685 am: 0ec72293c1
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1950240

Change-Id: I1e0f256956cbe19d93853120a15bb3712f770b35
2022-01-17 21:11:31 +00:00
Nick Desaulniers
0ec72293c1 Revert "Revert "Require clang be used to assemble the kernel"" am: 1ede69c685
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1950240

Change-Id: I7d6aadaba44d5658285b802f238079c26d16bb0a
2022-01-17 20:55:15 +00:00
Nick Desaulniers
1ede69c685 Revert "Revert "Require clang be used to assemble the kernel""
This reverts commit dd46951e69.

Reason for revert: downstream kernel projects failed an unrelated SELinux related test when they
updated from Android Common Kernel, so they rolled back their pull dropping the patches necessary
to make this test pass.

Bug: 210043760
Bug: 214384465
Change-Id: I0f591dfa23017fec00733891dad6ec286a697585
2022-01-14 18:57:39 +00:00
Jon Spivack
05b9fb2f5b Revert "Require clang be used to assemble the kernel" am: dd46951e69 am: 1f53e385c1 am: 7ece5b62b6 am: 4050ee0d7b
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1949616

Change-Id: Ief38de8d1c49bad7d42264c6752ccbf27f78fab3
2022-01-14 00:48:25 +00:00
Jon Spivack
4050ee0d7b Revert "Require clang be used to assemble the kernel" am: dd46951e69 am: 1f53e385c1 am: 7ece5b62b6
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1949616

Change-Id: If4bf962cca4afa6497a06fb9fd2e126b6d28064a
2022-01-14 00:31:17 +00:00
Jon Spivack
7ece5b62b6 Revert "Require clang be used to assemble the kernel" am: dd46951e69 am: 1f53e385c1
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1949616

Change-Id: Iac60b1d0cc3cc5de88bd60dba06b48f2f7b1c6fb
2022-01-14 00:12:53 +00:00
Jon Spivack
1f53e385c1 Revert "Require clang be used to assemble the kernel" am: dd46951e69
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1949616

Change-Id: Ida8fbcc806fab22948621f967c416c53f3ecf5ea
2022-01-13 23:55:11 +00:00
Jon Spivack
dd46951e69 Revert "Require clang be used to assemble the kernel"
This reverts commit 8631131e28.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=tangor-userdebug&lkgb=8077945&lkbb=8078056&fkbb=8078056, bug b/214440119

Bug: 214440119
Change-Id: Ib0b4c1d51333bba7ab989efd911c0783febb78d6
2022-01-13 23:25:15 +00:00