aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-13ANDROID: mke2fs: Support encrypt+casefold am: 4e37e48fd3 am: ce190a697c am: ↵Daniel Rosenberg
3b6258dcf3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11835204 Change-Id: Ia854235bf5dcbd4463ac0f047c39332c80d31f98
2020-09-13ANDROID: tune2fs: Support encrypt+casefold am: 5507593a03 am: 69eb917828 am: ↵Daniel Rosenberg
251ffdcc56 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11835203 Change-Id: Ieb526e198b286260d53d939c58ab2a44bcd77975
2020-09-13ANDROID: e2fsck: Do not mutate encrypted names am: 0c0b65bdcc am: c5d2af2e66 ↵Daniel Rosenberg
am: 34c93f6922 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11850659 Change-Id: I87b47d289f86b64fa18eeb1ca6f7a58233393379
2020-09-13ANDROID: tune2fs: Allow setting the casefold feature am: 4b8ccd34c9 am: ↵Daniel Rosenberg
65ba12294c am: a3fdc4db9d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11205030 Change-Id: I8d5d6dc0bdb6e3162cf8a7e64f0b1e0f4ae0ac99
2020-09-13[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am: c0c15ff756 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: I20a9517f76ce239e3ff93eb11cfae48cb290acd8
2020-09-13ANDROID: e2fsck: Handle casefolded encryption am: 156028c42e am: 69a1d5f0c3Daniel Rosenberg
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11205331 Change-Id: I48c09131a4dc3f490ad732c21aaa8512494c6a23
2020-09-13ANDROID: mke2fs: Support encrypt+casefold am: 4e37e48fd3 am: ce190a697cDaniel Rosenberg
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11835204 Change-Id: Ie69023c209fe038c4a6cedb97381947cbb1446cf
2020-09-13ANDROID: tune2fs: Support encrypt+casefold am: 5507593a03 am: 69eb917828Daniel Rosenberg
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11835203 Change-Id: If1208b04fa7708c7b6e8733dae8cb1d428a320d4
2020-09-13ANDROID: e2fsck: Do not mutate encrypted names am: 0c0b65bdcc am: c5d2af2e66Daniel Rosenberg
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11850659 Change-Id: I3b5cb79876ff4de87e6758ebfebf4840e99940b3
2020-09-13ANDROID: tune2fs: Allow setting the casefold feature am: 4b8ccd34c9 am: ↵Daniel Rosenberg
65ba12294c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11205030 Change-Id: I1fa704081dc04e0e6ae747649e75460a1a13b85d
2020-09-02Snap for 6807104 from d7e331022046009938dce7381e341a21e180aaae to sc-d1-releaseandroid-build-team Robot
Change-Id: If6a5b6007ea43aad46a446f0141e73a4ee10b735
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am: f932c9b6f2 -s ours am: 8584d6b7b6 -s ours am: 2216f768df -s ours am: a97662c436 -s ours am skip reason: Change-Id I63ab1719ee1d0ccd28907f0bc99531260251fa99 with SHA-1 ec10b513c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: I96c59e8690b389ded0bade37feee2fcb33d113fd
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am: b5e4b833e7 -s ours am: 520b52bbcc -s ours am: 974b584f87 -s ours am: e771b709d8 -s ours am skip reason: Change-Id I63ab1719ee1d0ccd28907f0bc99531260251fa99 with SHA-1 ec10b513c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: Ifd3f64a8e1b1577a95c6f960e7ae07da89232e22
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am: f932c9b6f2 -s ours am: 4c243889d2 -s ours am: 2ee106c4d9 -s ours am: 3b6304cb6f -s ours am skip reason: Change-Id I63ab1719ee1d0ccd28907f0bc99531260251fa99 with SHA-1 ec10b513c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: Iee4bb7dc46c5bdcffe4f70957931ba10fe9f7820
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am: f932c9b6f2 -s ours am: 8584d6b7b6 -s ours am: 2216f768df -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: I49d53617c06515e12317e33d164a2611604aa2e6
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am: b5e4b833e7 -s ours am: 520b52bbcc -s ours am: 974b584f87 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: Ic70531f599300f56ed8878687bf3b6e3556106af
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am: f932c9b6f2 -s ours am: 4c243889d2 -s ours am: 2ee106c4d9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: I28dec7a55240b9946af6dc356c8369c3cd1c70c5
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am: f932c9b6f2 -s ours am: 8584d6b7b6 -s ours am skip reason: Change-Id I63ab1719ee1d0ccd28907f0bc99531260251fa99 with SHA-1 ec10b513c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: I7a0174b2611a939ff0807b15e669d9281934a4af
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am: b5e4b833e7 -s ours am: 520b52bbcc -s ours am skip reason: Change-Id I63ab1719ee1d0ccd28907f0bc99531260251fa99 with SHA-1 ec10b513c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: Ia7b43bf5f043815a931575a8285830aa2336683b
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am: f932c9b6f2 -s ours am: 4c243889d2 -s ours am skip reason: Change-Id I63ab1719ee1d0ccd28907f0bc99531260251fa99 with SHA-1 ec10b513c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: I40080871dc878009ec02757c5f7696c723452cca
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am: b5e4b833e7 -s ours am skip reason: Change-Id I63ab1719ee1d0ccd28907f0bc99531260251fa99 with SHA-1 ec10b513c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: Ib81a029fa9b508d7070add14ae41bca70c713d47
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵android-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r30android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-c-releaseKousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am: f932c9b6f2 -s ours am skip reason: Change-Id I63ab1719ee1d0ccd28907f0bc99531260251fa99 with SHA-1 ec10b513c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: Ic6fbe4514fc6e173dfcf9e836a36f6dcf44a841a
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am: f932c9b6f2 -s ours am skip reason: Change-Id I63ab1719ee1d0ccd28907f0bc99531260251fa99 with SHA-1 ec10b513c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: I65415653de5495fd16f92e648edab451d48fbe59
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseKousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am skip reason: Change-Id I63ab1719ee1d0ccd28907f0bc99531260251fa99 with SHA-1 ec10b513c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: I5c25659d8950d2e2e13099c463f2b084e77e9670
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am skip reason: Change-Id I63ab1719ee1d0ccd28907f0bc99531260251fa99 with SHA-1 ec10b513c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: Iced108828ba31fc6cd2713fd37feacb2fe04ee81
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am skip reason: Change-Id I63ab1719ee1d0ccd28907f0bc99531260251fa99 with SHA-1 ec10b513c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: I7bc3b9c334ea7136876e7e772054db8bb86d4412
2020-09-01[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: I273745e63265ee26074d9be46115ad01b967bad9
2020-09-01[DO NOT MERGE] Change #define to _BLKID_TYPES_H am: 82c0e62db7Kousik Kumar
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: I74edfc1e781a2851a1a518ab0b07511ca008f9c0
2020-08-31[DO NOT MERGE] Change #define to _BLKID_TYPES_HKousik Kumar
blkid_types.h and ext_types.h having the exact same content results in mismatches in remote RBE builds. Given blkid_types.h is actually supposed to be different, changing this to remove the mismatch. Test: Ran a build, and all e2fsprogs mismatches went away between local/remote. Bug: b/166182389 Change-Id: Ia71e9e37035198dc3a44b38e41221fb65f048b15 Merged-In: I63ab1719ee1d0ccd28907f0bc99531260251fa99
2020-08-28Snap for 6796705 from d207caf0104ba792c4ec9e755ceeb526d71a3fc6 to sc-d1-releaseandroid-build-team Robot
Change-Id: Ibd4dc2cef9f5abcae086c42da904ebc1fee35985
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 7ac9e29961 -s ours am: c915068bdf -s ours am: 3cf706afbf -s ours am: 890cb11808 -s ours am: 1782656a88 -s ours am skip reason: Change-Id I27089388dd388660a573e703bdbccea4620f9ffb with SHA-1 0df1cb0c08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12469350 Change-Id: Ib9bc7803e659f2690d722836ace1f26633a670bc
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 7ac9e29961 -s ours am: c915068bdf -s ours am: 3cf706afbf -s ours am: 890cb11808 -s ours am skip reason: Change-Id I27089388dd388660a573e703bdbccea4620f9ffb with SHA-1 0df1cb0c08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12469350 Change-Id: If65b9ba8fef3d8cfc9c9528b3fe404fe18aa4ed3
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 7ac9e29961 -s ours am: c915068bdf -s ours am: 3cf706afbf -s ours am skip reason: Change-Id I27089388dd388660a573e703bdbccea4620f9ffb with SHA-1 0df1cb0c08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12469350 Change-Id: I4fd9acdf9ea6fae814d99ec7424414fff5bdb900
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 7ac9e29961 -s ours am: c915068bdf -s ours am skip reason: Change-Id I27089388dd388660a573e703bdbccea4620f9ffb with SHA-1 0df1cb0c08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12469350 Change-Id: I835add8be91e94197569f457d13f781412dcb61b
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 7ac9e29961 -s ours am skip reason: Change-Id I27089388dd388660a573e703bdbccea4620f9ffb with SHA-1 0df1cb0c08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12469350 Change-Id: I6cd5f1fb28c06e1251ef7d18ca9705ecc3ccf641
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I27089388dd388660a573e703bdbccea4620f9ffb Change-Id: I3e0866e5883f784ad72ed2f0053a8864f42285d9
2020-07-26Snap for 6709656 from f01548b02c7fa551f2b51a04eef45c6d46a1d018 to sc-d1-releaseandroid-build-team Robot
Change-Id: I88860fa79e8f6dfa28a318d57442154ab61e0683
2020-07-25Merge "Fix a trivial type error" am: 876a584da3 am: de4988b9df am: ↵Yi Kong
1a8aaa14e9 am: b274191b1a am: 88aa4da7bd am: 8f2d1c2c80 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1356683 Change-Id: I45400891a0da058c672323d7f0b4a8512f717b72
2020-07-25Merge "Fix a trivial type error" am: 876a584da3 am: de4988b9df am: ↵Yi Kong
1a8aaa14e9 am: b274191b1a am: 88aa4da7bd Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1356683 Change-Id: I95aa4090b88fb02048ea89a675df58dad20acd05
2020-07-25Merge "Fix a trivial type error" am: 876a584da3 am: de4988b9df am: ↵Yi Kong
1a8aaa14e9 am: b274191b1a Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1356683 Change-Id: Ie992f2d419f5eca6b23d50590253bb39d9ffd3e5
2020-07-25Merge "Fix a trivial type error" am: 876a584da3 am: de4988b9df am: 1a8aaa14e9Yi Kong
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1356683 Change-Id: If521539e4207b2c9ebe3836c2726d14f15eed325
2020-07-25Merge "Fix a trivial type error" am: 876a584da3 am: de4988b9dfYi Kong
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1356683 Change-Id: I875446e777f9d17f74623646bf419af6f3cc4bb3
2020-07-25Merge "Fix a trivial type error" am: 876a584da3Yi Kong
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1356683 Change-Id: I1d329b91642d2af8af40c6012ffa71522fbf418e
2020-07-25Merge "Fix a trivial type error"Yi Kong
2020-07-24Fix a trivial type errorYi Kong
Comparing unsigned int with ULONG_MAX is always false. Signed-off-by: Yi Kong <yikong@google.com> Change-Id: Iae02aad1bcb271d3468828977be288ad04333821
2020-06-25Snap for 6626632 from abe978c8c9c933c665c295d0086c26eeec19c8e7 to sc-d1-releaseandroid-build-team Robot
Change-Id: I0352ddf51278298d78af0710374b4d5dc12e0bd8
2020-06-24ANDROID: e2fsck: Handle casefolded encryption am: 156028c42e am: 0df1cb0c08 ↵Daniel Rosenberg
am: 4427bd234d am: 22b33bcdf8 am: 3bae6afbc7 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11205331 Change-Id: I1da7dc13a503715914708604e553c64d5421170e
2020-06-24ANDROID: mke2fs: Support encrypt+casefold am: 4e37e48fd3 am: f5b1798c57 am: ↵Daniel Rosenberg
a5e015459e am: 12b46db9c1 am: e1b58716eb Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11835204 Change-Id: Id047d1cd4f3ba1ea381d0f8bdec1c58825626008
2020-06-24ANDROID: tune2fs: Support encrypt+casefold am: 5507593a03 am: 39627a45e9 am: ↵Daniel Rosenberg
6a4769352a am: 5bcb7b9b1d am: ac1f392932 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11835203 Change-Id: I368f54d8396902764ff5fa29dc550f1744660f57
2020-06-24ANDROID: e2fsck: Do not mutate encrypted names am: 0c0b65bdcc am: c82dbd5e86 ↵Daniel Rosenberg
am: 0154eb7a9a am: f3f4329728 am: 4431105b6c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11850659 Change-Id: Ia8ea4c56cddcc26d864e694d5486e6c67be9b0f2
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 10:36:01 +0000