aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-24require modules required for bandwidth limiting on 5.10+ T+ am: 0dd2a87213 ↵android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releasePatrick Rohr
am: d0f6fd4b22 Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/18561847 Change-Id: I78e0b6432aed4c95a0b9a0bc31d4540f716a2a52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24require modules required for bandwidth limiting on 5.10+ T+ am: 0dd2a87213Patrick Rohr
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/18561847 Change-Id: I3d50a6dd4d3dfcca4fd8586b07b0b7afed31c99e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23require modules required for bandwidth limiting on 5.10+ T+android-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android13-tests-releaseandroid13-tests-devandroid13-devPatrick Rohr
Test: TreeHugger Bug: 157552970 Change-Id: I0095f5dbddc915e41efd5a7a8cdab5c34c5cf946 (cherry picked from commit d3c4f1712445903effc55503f059c787ebbd486c) Merged-In: I0095f5dbddc915e41efd5a7a8cdab5c34c5cf946
2022-05-19Freeze kernel min LTS version. am: 73d722613f am: 36f0f59a74Yifan Hong
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/17982173 Change-Id: I997d23dd8bf35127c3166446d2a44d672b07bf78 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19Freeze kernel min LTS version. am: 73d722613fYifan Hong
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/17982173 Change-Id: I8dec19d02d9ad9101e9473c9f13430774633d859 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18Freeze kernel min LTS version.Yifan Hong
- 5.10.107 - 5.15.41 Test: TH Bug: 230144764 Change-Id: I1ec7b5b7fcc7bf6c8b189b37f2b063cf250fec76
2022-04-27Freeze T kernel configs. am: a086ca56b0 am: 0f7ca050c2Yifan Hong
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/17944502 Change-Id: I428b8df406a58dc35e348e9f5cd839d5dd4abe5a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Delete recommended kernel configs. am: 959f84d169 am: 97ae09a114Yifan Hong
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/17968516 Change-Id: Ibd1b7599e418cc6c4b8b1be9e536588e83415a6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Freeze T kernel configs. am: a086ca56b0Yifan Hong
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/17944502 Change-Id: I2736bff8719997f5a50456bb6ab9537ce72fe749 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Delete recommended kernel configs. am: 959f84d169Yifan Hong
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/17968516 Change-Id: Ib2f4bef31aeef813acab2cb7e35d8fbca9b5ad45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Freeze T kernel configs.Yifan Hong
cp -r kernel/configs/android-* kernel/configs/t ... then manually edit target names Android.bp files. Also manually delete the "recommended configs". Test: TH Bug: 230144764 Change-Id: I32e32d34d5e630fba4b8fb7c491b29aee62e5025
2022-04-26Delete recommended kernel configs.Yifan Hong
Now with GKI, we no longer recommend configs. Test: TH Bug: 230144764 Change-Id: I3f3f9401482603eb41d03870b1a233d31b54a367
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: 943c41b573 -s ours am: 35f7412591 -s ours am: a98927cd39 -s ours am: 98216c393b -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: I08bdc8970fc86db4de1a088a18027a1fbe086d50 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
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[automerger skipped] Empty merge of ↵Xin Li
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-19[automerger skipped] Empty merge of ↵Xin Li
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-18Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047Xin Li
Bug: 226662282 Merged-In: I876267ab4e44083215ae313de5e4897b06e9ec49 Change-Id: I60c26dfee259a132e24150108549848b50f93086
2022-04-13Convert kconfig_xml_fixup to python 3 am: 9cb0c67c72 am: b5867e2adf am: ↵Cole Faust
eb376fd02b am: 27873243a0 am: e693d8c666 Original change: https://android-review.googlesource.com/c/kernel/configs/+/2061123 Change-Id: I181ac3c8afb48cc65179e956d9639ca90c323a9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Convert kconfig_xml_fixup to python 3 am: 9cb0c67c72 am: b5867e2adf am: ↵Cole Faust
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-13Convert kconfig_xml_fixup to python 3 am: 9cb0c67c72 am: b5867e2adf am: ↵Cole Faust
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-13Convert kconfig_xml_fixup to python 3 am: 9cb0c67c72 am: b5867e2adfCole Faust
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-13Convert kconfig_xml_fixup to python 3 am: 9cb0c67c72Cole Faust
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-12Convert kconfig_xml_fixup to python 3android-t-beta-2_r0.4android-gs-raviole-5.10-t-beta-2Cole Faust
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-03[automerger skipped] Mark ab/8389834 as merged am: 8f9c921f74 -s ours am: ↵Xin Li
a69f1632c4 -s ours am: 917243e6ff -s ours am: 70271c3497 -s ours am: e738f94fc3 -s ours am: eef9c8748d -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: Ie186c63cc13dd5a33b3b91dcd654fb3bdde3018a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Mark ab/8389834 as merged am: 8f9c921f74 -s ours am: ↵Xin Li
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[automerger skipped] Mark ab/8389834 as merged am: 8f9c921f74 -s ours am: ↵Xin Li
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[automerger skipped] Mark ab/8389834 as merged am: 8f9c921f74 -s ours am: ↵Xin Li
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[automerger skipped] Mark ab/8389834 as merged am: 8f9c921f74 -s ours am: ↵Xin Li
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[automerger skipped] Mark ab/8389834 as merged am: 8f9c921f74 -s oursXin Li
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-01Mark ab/8389834 as mergedandroid-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android12L-tests-releaseandroid12L-tests-devXin Li
Bug: 188847863 Merged-In: If26571c075946bbc3ca92dde9b4b813881365b26 Change-Id: Id187187103d146f0abb1a6e375488a2ba92ddf95
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
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[automerger skipped] Empty merge of ↵Xin Li
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-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891android-t-beta-1_r0.4android-gs-raviole-5.10-t-beta-1Xin Li
Bug: 214455710 Merged-In: Ib0b4c1d51333bba7ab989efd911c0783febb78d6 Change-Id: Ic92c1ed88c5a7755eff0d09b6b880d54f3462649
2022-02-07Merge "Require CONFIG_INIT_STACK_ALL_ZERO on arches that support it" am: ↵Alexander Potapenko
4ca2ff98bf am: 9d91925e45 am: 82187f9b33 am: 7a72153fc0 Original change: https://android-review.googlesource.com/c/kernel/configs/+/1972679 Change-Id: I9dfe4a0eca28be0afac3a47116ea1471aa4ed2ae
2022-02-07Merge "Require CONFIG_INIT_STACK_ALL_ZERO on arches that support it" am: ↵Alexander Potapenko
4ca2ff98bf am: 9d91925e45 am: 82187f9b33 Original change: https://android-review.googlesource.com/c/kernel/configs/+/1972679 Change-Id: I0bc14850c1ebf1d460d24c0b57a658cb96422256
2022-02-07Merge "Require CONFIG_INIT_STACK_ALL_ZERO on arches that support it" am: ↵Alexander Potapenko
4ca2ff98bf am: 9d91925e45 Original change: https://android-review.googlesource.com/c/kernel/configs/+/1972679 Change-Id: Ibc4fe16a0111a629a9c5e0dec72f397032bf1005
2022-02-07Merge "Require CONFIG_INIT_STACK_ALL_ZERO on arches that support it" am: ↵Alexander Potapenko
4ca2ff98bf Original change: https://android-review.googlesource.com/c/kernel/configs/+/1972679 Change-Id: I5965804a34fcf6469b76b5870c2bc53787907a0d
2022-02-07Merge "Require CONFIG_INIT_STACK_ALL_ZERO on arches that support it"android-t-preview-2_r0.4android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1android-gs-raviole-5.10-t-preview-2Alexander Potapenko
2022-02-07Disable CONFIG_VMAP_STACK for KASAN builds am: 23acefc286 am: 7425df250d am: ↵Jeff Vander Stoep
85563c35e9 am: 5c3e2f4d00 Original change: https://android-review.googlesource.com/c/kernel/configs/+/1974459 Change-Id: I6c88b2e42409ea02771af4135d8fa85058e38f31
2022-02-07Disable CONFIG_VMAP_STACK for KASAN builds am: 23acefc286 am: 7425df250d am: ↵Jeff Vander Stoep
85563c35e9 Original change: https://android-review.googlesource.com/c/kernel/configs/+/1974459 Change-Id: I074736e30b19ca54ad3a9f8fbecf01701022ea14
2022-02-07Disable CONFIG_VMAP_STACK for KASAN builds am: 23acefc286 am: 7425df250dJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1974459 Change-Id: Ic2e419ebe4db8fa4797de685502144e6da4dd25a
2022-02-07Disable CONFIG_VMAP_STACK for KASAN builds am: 23acefc286Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1974459 Change-Id: I881ef6a3406f34b64f78dce642e7bcefd56ea992
2022-02-07Disable CONFIG_VMAP_STACK for KASAN buildsJeff Vander Stoep
Test: treehugger Bug: 117194687 Signed-off-by: Jeff Vander Stoep <jeffv@google.com> Change-Id: I876267ab4e44083215ae313de5e4897b06e9ec49
2022-02-04Require CONFIG_INIT_STACK_ALL_ZERO on arches that support itAlexander Potapenko
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-01-31Merge "Require CONFIG_VMAP_STACK on arches that support it" am: c9727b8ce3 ↵Treehugger Robot
am: 33acbc7246 am: 609d5a9d00 am: f32dd8c8e5 Original change: https://android-review.googlesource.com/c/kernel/configs/+/1958799 Change-Id: Ie21721fb4d31812e27d5847f4244dfec227f8014
2022-01-31Merge "Require CONFIG_VMAP_STACK on arches that support it" am: c9727b8ce3 ↵Treehugger Robot
am: 33acbc7246 am: 609d5a9d00 Original change: https://android-review.googlesource.com/c/kernel/configs/+/1958799 Change-Id: I7cc5396df8ca3b8a7b2d581492a91141bfaac78c
2022-01-31Merge "Require CONFIG_VMAP_STACK on arches that support it" am: c9727b8ce3 ↵Treehugger Robot
am: 33acbc7246 Original change: https://android-review.googlesource.com/c/kernel/configs/+/1958799 Change-Id: Ifc37ff0fbfde1868fd0734a7dc560b91a513b619
2022-01-31Merge "Require CONFIG_VMAP_STACK on arches that support it" am: c9727b8ce3Treehugger Robot
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1958799 Change-Id: If1fb98c238286b6bf93c300b295d6b0203c41268
2022-01-31Merge "Require CONFIG_VMAP_STACK on arches that support it"android-t-preview-1_r0.4android-gs-raviole-5.10-t-preview-1Treehugger Robot
2022-01-26Fix licenses and license texts. am: 8e30736b3d am: 077b04892f am: ca378ac516 ↵Bob Badour
am: 5127b1fae6 Original change: https://android-review.googlesource.com/c/kernel/configs/+/1959761 Change-Id: I0521d2a1e74d9ed8383bc92796f201b3fc5b4185