aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-02-06Merge "Remove extra uapi from include."android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-mr2-preview-2android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-iot-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-releasen-preview-2n-mr2-preview-1n-mr1-preview-1n-iot-preview-4Christopher Ferris
2016-02-05Remove extra uapi from include.Christopher Ferris
There appears to be a typo in the include in siginfo.h for mips. Remove the uapi portion (which has already been done in the bionic versions). Bug: 23789423 Change-Id: Iea355d71d84e9efb4bcd1b6873aa1e7f3c8d0bf0
2016-02-06Merge "Updated to v4.4.1 kernel headers."Christopher Ferris
2016-02-04Updated to v4.4.1 kernel headers.Christopher Ferris
Bug: 23789423 Change-Id: I45ef68b3955c1f4d91ed53db8c519fce64d57f09
2015-09-19am 6d23923a: am d65800a0: Merge "Import scsi headers"Christopher Ferris
* commit '6d23923aa76ce5004f85425f7d85fc0ce4020f01': Import scsi headers
2015-09-19am d65800a0: Merge "Import scsi headers"Christopher Ferris
* commit 'd65800a04b40146ae8591f723da1b6871b9ecc0e': Import scsi headers
2015-09-18Merge "Import scsi headers"Christopher Ferris
2015-09-17Import scsi headersGreg Hackmann
Linux's scsi headers are a mix of userspace-facing and kernel-facing declarations that can't be directly used by userspace. The glibc maintainers manually copy-and-pasted these definitions into their own scsi headers and haven't substantially updated them in 15 years. musl has a similar set of definitions in its scsi headers. scsi/scsi.h has been modified from the 3.18 headers to put #define __KERNEL__ ... #endif around the sections that other libc implementations don't expose. scsi/{scsi_ioctl,sg}.h are the original upstream headers. The cleaned-up versions of these headers are equivalent to the same headers in glibc and musl (though much more up-to-date). Change-Id: I3395f7433d91c4c661bd1b88d392b1b11f1ad557 Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-09-03am a3140e58: am 68ffdee6: Merge "Update to v3.18.21 kernel headers."Christopher Ferris
* commit 'a3140e5801d69dc3a818d09eb3097f78204a7d86': Update to v3.18.21 kernel headers.
2015-09-03am 68ffdee6: Merge "Update to v3.18.21 kernel headers."Christopher Ferris
* commit '68ffdee696b57b63fce2753508662a920ad71b11': Update to v3.18.21 kernel headers.
2015-09-03Merge "Update to v3.18.21 kernel headers."Christopher Ferris
2015-09-02Update to v3.18.21 kernel headers.Christopher Ferris
Change-Id: If068c58cfe6ac29fab76219dbe2eb5b11cf71246
2015-08-27am db47ea76: (-s ours) am 6bab84bb: Merge "Update to v3.18.18 kernel headers."Christopher Ferris
* commit 'db47ea76ab83f2ef5aca42de240035885dc7ad1a':
2015-07-14am 6bab84bb: Merge "Update to v3.18.18 kernel headers."Christopher Ferris
* commit '6bab84bbc715738d7de393a6b2943926cf0402f1': Update to v3.18.18 kernel headers.
2015-07-14am 6bab84bb: Merge "Update to v3.18.18 kernel headers."Christopher Ferris
* commit '6bab84bbc715738d7de393a6b2943926cf0402f1': Update to v3.18.18 kernel headers.
2015-07-14Merge "Update to v3.18.18 kernel headers."Christopher Ferris
2015-07-13Update to v3.18.18 kernel headers.Christopher Ferris
Change-Id: I76cc04c2267ef904ef8e18acdab72be4c4da4523
2015-04-01am 8bc979c0: Merge "Upgrade kernel headers to 3.18.10."android-m-preview-2android-m-preview-1android-m-previewandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseChristopher Ferris
* commit '8bc979c0f7b0b30b579b38712a091e7d2037c77e': Upgrade kernel headers to 3.18.10.
2015-03-31Merge "Upgrade kernel headers to 3.18.10."master-soongChristopher Ferris
2015-03-31Upgrade kernel headers to 3.18.10.Christopher Ferris
Change-Id: I23a3a4062f3f71ef1df4a3c82b0a50b66b964426
2015-03-05am e2841822: am d0538bb1: Merge "Add NOTICE file"Conley Owens
* commit 'e2841822257360cb230f905142503ce6a684005b': Add NOTICE file
2015-03-05am d0538bb1: Merge "Add NOTICE file"Conley Owens
* commit 'd0538bb1da6634d8f0898e1bb52846f268585614': Add NOTICE file
2015-03-05Merge "Add NOTICE file"Conley Owens
2015-03-03Add NOTICE fileConley Owens
Change-Id: Ibf3570879893c56e2771109f2ed0c9d5c6a285c6
2015-01-26am 9c01095b: am 416ad023: Merge "Update to kernel header v3.18.3."Christopher Ferris
* commit '9c01095ba3951d4e98a9bc3c0f37ff672ad61fb8': Update to kernel header v3.18.3.
2015-01-26am 416ad023: Merge "Update to kernel header v3.18.3."Christopher Ferris
* commit '416ad023935dc33e24030513ee47cb8df8ba395b': Update to kernel header v3.18.3.
2015-01-26Merge "Update to kernel header v3.18.3."Christopher Ferris
2015-01-23Update to kernel header v3.18.3.Christopher Ferris
Bug: 19127803 Change-Id: I1e00b613153b691fe960b6e080d498f0f65f33b7
2014-10-26am c053db07: am fdcbe82d: am 0de034a4: Merge "Move to v3.16.3 kernel headers."Christopher Ferris
* commit 'c053db07c309751ec1f3fcc4d2fbc734d9832003':
2014-10-26am 399b3609: am d5e8fa88: am e3aa3272: Merge "Update kernel headers to v3.16.1"Christopher Ferris
* commit '399b36094ac92f4e474d6bdc97d77f88287222c6':
2014-10-26am fdcbe82d: am 0de034a4: Merge "Move to v3.16.3 kernel headers."Christopher Ferris
* commit 'fdcbe82d7a1b2b60c30bdea1ef9c0967ab9550c5':
2014-10-26am d5e8fa88: am e3aa3272: Merge "Update kernel headers to v3.16.1"Christopher Ferris
* commit 'd5e8fa8851736f0bc60c6c84500b2ad9a527672a':
2014-09-19am 4ec6d6ca: am 0de034a4: Merge "Move to v3.16.3 kernel headers."Christopher Ferris
* commit '4ec6d6caaa3bb1edd5a464b247ed815a839ef922': Move to v3.16.3 kernel headers.
2014-09-19am b2ad8ad3: am e3aa3272: Merge "Update kernel headers to v3.16.1"Christopher Ferris
* commit 'b2ad8ad3f0d1e5645182fdfa8e52245f83d35d6f':
2014-09-18am 0de034a4: Merge "Move to v3.16.3 kernel headers."Christopher Ferris
* commit '0de034a4ab74ecf1cab41e58f0e8aa92551141bf': Move to v3.16.3 kernel headers.
2014-09-18am 0de034a4: Merge "Move to v3.16.3 kernel headers."Christopher Ferris
* commit '0de034a4ab74ecf1cab41e58f0e8aa92551141bf': Move to v3.16.3 kernel headers.
2014-09-18Merge "Move to v3.16.3 kernel headers."Christopher Ferris
2014-09-18Move to v3.16.3 kernel headers.Christopher Ferris
Change-Id: I91e46cf6ba3ed24666029d5611b77f9164c8087f
2014-09-18am d5e8fa88: am e3aa3272: Merge "Update kernel headers to v3.16.1"Christopher Ferris
* commit 'd5e8fa8851736f0bc60c6c84500b2ad9a527672a': Update kernel headers to v3.16.1
2014-09-18am e3aa3272: Merge "Update kernel headers to v3.16.1"Christopher Ferris
* commit 'e3aa32726e5258ae2039c39814e0f2909da1fa5d': Update kernel headers to v3.16.1
2014-09-18am e3aa3272: Merge "Update kernel headers to v3.16.1"Christopher Ferris
* commit 'e3aa32726e5258ae2039c39814e0f2909da1fa5d': Update kernel headers to v3.16.1
2014-09-18Merge "Update kernel headers to v3.16.1"Christopher Ferris
2014-09-14am 7e41dfd2: am a4e85bb3: Pull input.h from v3.16.1 kernel headers.Christopher Ferris
* commit '7e41dfd24e37a1bf91e5c6d6ccf79c2b2c6fd97a': Pull input.h from v3.16.1 kernel headers.
2014-09-14am a4e85bb3: Pull input.h from v3.16.1 kernel headers.Christopher Ferris
* commit 'a4e85bb34a308060893b248d2b13d7fe02a131f1': Pull input.h from v3.16.1 kernel headers.
2014-09-14Pull input.h from v3.16.1 kernel headers.android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-previewChristopher Ferris
Bug: 17407564 Change-Id: I8e3b6bf5e28e42660a82ccc5a655f6aaaa0342fc
2014-09-02Update kernel headers to v3.16.1Christopher Ferris
Change-Id: I6dfc0dc4e53b1d2de9b4e876144a22bba184f8e4
2014-07-15am 76cc3d80: (-s ours) am e87eaf04: reconcile aosp ↵Ed Heyl
(8b663ef01dcaadfe1dec7ba826e5cd1cf0bb2c91) after branching. Please do not merge. * commit '76cc3d808ed0b38f992e3a9b765e7150d4706fdc': reconcile aosp (8b663ef01dcaadfe1dec7ba826e5cd1cf0bb2c91) after branching. Please do not merge.
2014-07-15am e87eaf04: reconcile aosp (8b663ef01dcaadfe1dec7ba826e5cd1cf0bb2c91) after ↵Ed Heyl
branching. Please do not merge. * commit 'e87eaf040ab639e94ed0a58ff0eac68d1d38fb0a': reconcile aosp (8b663ef01dcaadfe1dec7ba826e5cd1cf0bb2c91) after branching. Please do not merge.
2014-07-14reconcile aosp (8b663ef01dcaadfe1dec7ba826e5cd1cf0bb2c91) after branching. ↵Ed Heyl
Please do not merge. Change-Id: Ie1de3508b9a4c39330aa2efd895073a07d8933fa
2014-07-14am 8b663ef0: Merge "Update to v3.14 kernel headers."Christopher Ferris
* commit '8b663ef01dcaadfe1dec7ba826e5cd1cf0bb2c91': Update to v3.14 kernel headers.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 04:35:46 +0000