aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-04Merge "Update to v5.12 kernel headers."android-s-beta-1Christopher Ferris
2021-05-03Update to v5.12 kernel headers.Christopher Ferris
Kernel headers coming from: Git: https://android.googlesource.com/kernel/common/ Branch: android-mainline Tag: android-mainline-5.12 Test: NA Change-Id: Ie05f9537ef2dd4833a6a711af4562f56a8d435e1
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: If5cb3a2621d9b69b35030b0d7fd3ada239816197 Change-Id: I091dc33e1091d4cac8fad1cd330c390e56a52f3f
2021-02-19Merge "Update to v5.11 kernel headers." am: c7e66e3bf4Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1593077 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia91ee53e6f404b507ce1ae46f880d7fc7e94b525
2021-02-19Merge "Update to v5.11 kernel headers."Christopher Ferris
2021-02-16Update to v5.11 kernel headers.Christopher Ferris
Kernel headers coming from: Git: https://android.googlesource.com/kernel/common/ Branch: android-mainline Tag: android-mainline-5.11 Test: NA Change-Id: I226b5d0e5ff280e66b5feab6b7396ea5bd24b3c3
2020-12-15Merge "Update to v5.10 kernel headers." am: 1e3fe3e7c8 am: b20db4ac6cChristopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1529758 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If5cb3a2621d9b69b35030b0d7fd3ada239816197
2020-12-15Merge "Update to v5.10 kernel headers." am: 1e3fe3e7c8Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1529758 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0b92e03a1525fe5affd5273b9191f4c58cc14ad9
2020-12-15Merge "Update to v5.10 kernel headers."android-s-preview-1Christopher Ferris
2020-12-14Update to v5.10 kernel headers.Christopher Ferris
Kernel headers coming from: Git: https://android.googlesource.com/kernel/common/ Branch: android-mainline Tag: android-mainline-5.10 Test: NA Change-Id: Ifba11e6771d8882a95864b789f80376b29f94a4d
2020-11-24Mark ab/6881855 as merged am: 1210edca30Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kernel-headers/+/13111007 Change-Id: I21b602bcab6533d7b4b3f10a797cff0f49cd75ae
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I645ffd65656ea7bd4618055b259376390723304c
2020-10-22Merge "Update to v5.9 kernel headers." am: a196ecc3f1 am: 223a2e2d0e am: ↵Christopher Ferris
abcc5ab389 Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1466451 Change-Id: I4465b321ba81b9129f1c3cf8db49d43f30c551f0
2020-10-22Merge "Update to v5.9 kernel headers." am: a196ecc3f1 am: 223a2e2d0eChristopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1466451 Change-Id: I934d19195db4d3f7dbef703f58bc19855f21214d
2020-10-22Merge "Update to v5.9 kernel headers." am: a196ecc3f1Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1466451 Change-Id: Ie67f1d95fdf5ffc891eae01087f8489aacf23f56
2020-10-22Merge "Update to v5.9 kernel headers."Christopher Ferris
2020-10-19Update to v5.9 kernel headers.Christopher Ferris
Kernel headers coming from: Git: https://android.googlesource.com/kernel/common/ Branch: android-mainline Tag: android-mainline-5.9 Test: NA Change-Id: Ib17f14ffee224a2db9c0e62d12333fc1bec64d43
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: f7daddefb1 -s ours am: ↵Xin Li
92b0b8e93e -s ours am skip reason: Change-Id If1cba9653209608b170993c1f1bdfe251556aef4 with SHA-1 12518d39af is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kernel-headers/+/12796865 Change-Id: I024c10bb442007da105abb7cb75f86ce3ac17e93
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: f7daddefb1 -s oursXin Li
am skip reason: Change-Id If1cba9653209608b170993c1f1bdfe251556aef4 with SHA-1 12518d39af is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kernel-headers/+/12796865 Change-Id: I44c3adfc98aad9531718db49733ce2942df09bcf
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: If1cba9653209608b170993c1f1bdfe251556aef4 Change-Id: I10e076fba2d0d38af06320ee45333f5fe158d14a
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cd8ae1d721 -s ours am: 696427b37b -s ours am: 567525eb91 -s ours am skip reason: Change-Id I321ea290944b9adef46fd5f680caf4893aa4b4a6 with SHA-1 b4f34ea308 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kernel-headers/+/12469928 Change-Id: I787b04eaaa44f11f43ec1e03ac2e6fd05c4c5382
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cd8ae1d721 -s ours am: 696427b37b -s ours am skip reason: Change-Id I321ea290944b9adef46fd5f680caf4893aa4b4a6 with SHA-1 b4f34ea308 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kernel-headers/+/12469928 Change-Id: Iae0853c1b8247b1e2d9ad36a6b06aeec0719c162
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cd8ae1d721 -s ours am skip reason: Change-Id I321ea290944b9adef46fd5f680caf4893aa4b4a6 with SHA-1 b4f34ea308 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kernel-headers/+/12469928 Change-Id: Icd798ea1c6d8b636e2b89bf8de86d22f873a5c08
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I321ea290944b9adef46fd5f680caf4893aa4b4a6 Change-Id: I35227fc8deb598a4174b1d74a2daad281ba446a5
2020-08-06Merge "Update to v5.8 kernel headers." am: c9541004dd am: fddc14235d am: ↵Christopher Ferris
7531701d06 am: 12518d39af Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1389244 Change-Id: I40ef6fb253c38abeef8227756a987bdb14dc1208
2020-08-06Merge "Update to v5.8 kernel headers." am: c9541004dd am: fddc14235d am: ↵Christopher Ferris
7531701d06 Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1389244 Change-Id: If1cba9653209608b170993c1f1bdfe251556aef4
2020-08-06Merge "Update to v5.8 kernel headers." am: c9541004dd am: fddc14235dChristopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1389244 Change-Id: I6b335d6b2e804cd4afe473859176eb2f570a4a57
2020-08-06Merge "Update to v5.8 kernel headers." am: c9541004ddChristopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1389244 Change-Id: Ifc0b01b6f95a36afa739242a96e7df37f9c7b100
2020-08-06Merge "Update to v5.8 kernel headers."Christopher Ferris
2020-08-03Update to v5.8 kernel headers.Christopher Ferris
Kernel headers coming from: Git: https://android.googlesource.com/kernel/common/ Branch: android-mainline Tag: android-mainline-5.8 Test: NA Change-Id: I736145e51b84fdcdd1c99f8113453347ebeb5d80
2020-06-05Merge "Remove the arm kvm.h." am: e58316e074 am: 2434020edb am: b4f34ea308 ↵Christopher Ferris
am: fb62490dfe Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1324020 Change-Id: I950cc1a68cc2cd64976ba12bb178bfdf0caf9b1b
2020-06-05Merge "Remove the arm kvm.h." am: e58316e074 am: 2434020edb am: b4f34ea308Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1324020 Change-Id: I08832c8ac18fca8741801bd0ab06c814156bf24b
2020-06-05Merge "Remove the arm kvm.h." am: e58316e074 am: 2434020edbChristopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1324020 Change-Id: I321ea290944b9adef46fd5f680caf4893aa4b4a6
2020-06-05Merge "Remove the arm kvm.h." am: e58316e074Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1324020 Change-Id: Ifd96682291238afa733227abb8458f5932567a9c
2020-06-05Merge "Remove the arm kvm.h."Christopher Ferris
2020-06-04Remove the arm kvm.h.Christopher Ferris
This file was intentionally deprecated, so really remove it. Test: NA Change-Id: I4e3393bd81e019bd85a4312c54201de80f48ebdc
2020-06-03Merge "Update to v5.7 kernel headers." am: 6772970d7d am: c95e88970f am: ↵Christopher Ferris
5dcdcd89d5 am: a527084e55 Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1322004 Change-Id: Ia3fc791226237b2d70f4676a2b96f892a0e7f972
2020-06-02Merge "Update to v5.7 kernel headers." am: 6772970d7d am: c95e88970f am: ↵Christopher Ferris
5dcdcd89d5 Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1322004 Change-Id: I35a4b387517983f67f7f8af0182114f51ef96f38
2020-06-02Merge "Update to v5.7 kernel headers." am: 6772970d7d am: c95e88970fChristopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1322004 Change-Id: I647c835865a07816e016d45c089fd5bccde6c595
2020-06-02Merge "Update to v5.7 kernel headers." am: 6772970d7dChristopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/kernel-headers/+/1322004 Change-Id: I13302e5d1a1ff85717c9db2a14070228e52dd400
2020-06-02Merge "Update to v5.7 kernel headers."Christopher Ferris
2020-06-02Update to v5.7 kernel headers.Christopher Ferris
Kernel headers coming from: Git: https://android.googlesource.com/kernel/common/ Branch: android-mainline Tag: android-mainline-5.7 Includes updates of original/scsi files to match kernel headers: scsi_ioctl.h sg.h Test: NA Change-Id: I64fbf2d51c055a1ae8b94075d1c9bb45831211a3
2020-04-29Merge "Add METADATA to kernel-headers: GPL+LGPL=RESTRICTED" am: 5b94a263a6 ↵Bob Badour
am: 427caedbda am: 88a15a2d3d am: df27bc3d00 Change-Id: Ib89ccccc4eb7616dec63994349b84c128919311d
2020-04-29Merge "Add METADATA to kernel-headers: GPL+LGPL=RESTRICTED" am: 5b94a263a6 ↵Bob Badour
am: 427caedbda am: 88a15a2d3d Change-Id: I4dede4e7d7366f05a44c62e8a808c204d8abd007
2020-04-29Merge "Add METADATA to kernel-headers: GPL+LGPL=RESTRICTED" am: 5b94a263a6 ↵Bob Badour
am: 427caedbda Change-Id: Ie84336d587a84dd0f1ae60f360fad6b2fc43d8a1
2020-04-28Merge "Add METADATA to kernel-headers: GPL+LGPL=RESTRICTED" am: 5b94a263a6Bob Badour
Change-Id: I9da9f43f345f3e43e9cc658a651d5129aaa1793f
2020-04-28Merge "Add METADATA to kernel-headers: GPL+LGPL=RESTRICTED"Bob Badour
2020-04-28Add METADATA to kernel-headers: GPL+LGPL=RESTRICTEDBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ie9c505a9558c75eb3bf5d1179f045c03a1e3021c
2020-04-10Merge "Update to v5.6 kernel headers." am: 2040a899ae am: b5ddc7c772 am: ↵Christopher Ferris
270755492e am: 1e57861f9e Change-Id: I88e868b57690a328daa18954e5c3894a9606218c
2020-04-10Merge "Update to v5.6 kernel headers." am: 2040a899ae am: b5ddc7c772 am: ↵Christopher Ferris
270755492e Change-Id: Id924ef4a331bcb20705c0fbabc4e622893848cb3