Commits · aml_neu_351010040 · CodeLinaro / la / device / google / coral-kernel

Mar 06, 2024

Merge Android 14 QPR2 to AOSP main · 0a6ff12a

Xin Li authored 1 year ago

Bug: 319669529
Merged-In: I8290e3b1a837fef78fb7569c26dc2f594d6f9df3
Change-Id: Ib0c34e4b4cb52fcf86570dfae26b34835520c4e7

0a6ff12a

Jan 16, 2024

Merge ab/11220357 · d9960651

Xin Li authored 1 year ago

Merged-In: I5a55b9a9ff01b720f77b25a686072e2a642947d5
Change-Id: I8290e3b1a837fef78fb7569c26dc2f594d6f9df3

d9960651

Dec 08, 2023

Merge Android 14 QPR1 · 9e4bb8d9

Xin Li authored 1 year ago

Merged-In: I5c6c1a43089d27fbe61e7d3e8fbe307df4c13751
Bug: 315507370
Change-Id: Iff7ba371b8177731b352996b813c74567838d356

9e4bb8d9

Oct 17, 2023

Merge 10952656 · ceaec5b3

Xin Li authored 1 year ago

Merged-In: I5a55b9a9ff01b720f77b25a686072e2a642947d5
Change-Id: I5c6c1a43089d27fbe61e7d3e8fbe307df4c13751

ceaec5b3

Oct 05, 2023

Merge Android 14 · 1f520f4c

Xin Li authored 1 year ago

Bug: 298295554
Merged-In: I9f819e69fc74f399619a3e43965d9e67bbd7d9a2
Change-Id: I5e5e31f4a19ebbb7112ea37422c8145c79548327

1f520f4c

Aug 14, 2023

Merge Android U (ab/10368041) · 6c24b206

Xin Li authored 1 year ago

Bug: 291102124
Merged-In: Id94d29052a410ccc23c78bd2940989438c3a09d9
Change-Id: I1d7fcd6c20084ad82151219b911a24ba2138c134

6c24b206

Jul 14, 2023

[automerger skipped] DO NOT MERGE - Skip QQ1A.191003.001 in stage-aosp-master... · afeae9ca

Xin Li authored 1 year ago

[automerger skipped] DO NOT MERGE - Skip QQ1A.191003.001 in stage-aosp-master am: 011f498e -s ours am: abd8d7c5 -s ours am: a5d9e286 -s ours am: bc789205 -s ours

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: Iee77c6547679590ae1038bf8735749adc4b82c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

afeae9ca

[automerger skipped] DO NOT MERGE -... · db16c9ff

Xin Li authored 1 year ago

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: ff6733ab -s ours am: 348755ad -s ours am: 3f91b130 -s ours am: c6961adb -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/9646489



Change-Id: Ia4ce7f4a336b0d10b94fb8aad26ed3a2b78de7de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

db16c9ff

[automerger skipped] DO NOT MERGE - Skip QQ1A.191003.001 in stage-aosp-master... · bc789205

Xin Li authored 1 year ago

[automerger skipped] DO NOT MERGE - Skip QQ1A.191003.001 in stage-aosp-master am: 011f498e -s ours am: abd8d7c5 -s ours am: a5d9e286 -s ours

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I5a55b9a9ff01b720f77b25a686072e2a642947d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bc789205

[automerger skipped] DO NOT MERGE -... · c6961adb

Xin Li authored 1 year ago

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: ff6733ab -s ours am: 348755ad -s ours am: 3f91b130 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/9646489



Change-Id: Ia6da3e8743f95ab8ebc4272bff58f53e742e5257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c6961adb

[automerger skipped] DO NOT MERGE - Skip QQ1A.191003.001 in stage-aosp-master... · a5d9e286

Xin Li authored 1 year ago

[automerger skipped] DO NOT MERGE - Skip QQ1A.191003.001 in stage-aosp-master am: 011f498e -s ours am: abd8d7c5 -s ours

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I566c37a833c9fc3a4fdbdfc899d88d4d05b71066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

a5d9e286

[automerger skipped] DO NOT MERGE -... · 3f91b130

Xin Li authored 1 year ago

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: ff6733ab -s ours am: 348755ad -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/9646489



Change-Id: I4459c71a9585876df41087fef5502df4de886e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3f91b130

[automerger skipped] DO NOT MERGE - Skip QQ1A.191003.001 in stage-aosp-master... · abd8d7c5

Xin Li authored 1 year ago

[automerger skipped] DO NOT MERGE - Skip QQ1A.191003.001 in stage-aosp-master am: 011f498e -s ours

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: Ifdcaaf438f0b9fffd0d47a4465b4d42d90548757
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

abd8d7c5

[automerger skipped] DO NOT MERGE -... · 348755ad

Xin Li authored 1 year ago

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: ff6733ab -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/9646489



Change-Id: I9e04358b7806e20402d0f69cc9e0512737900a4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

348755ad

Dec 09, 2022

Merge Android 13 QPR1 · ab746a74

Xin Li authored 2 years ago

Bug: 261731544
Merged-In: I9f819e69fc74f399619a3e43965d9e67bbd7d9a2
Change-Id: I99d3d2220916ec65585d68edff9b21df473d4484

ab746a74

Oct 06, 2022

Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 · b2cdd9aa

Xin Li authored 2 years ago

Bug: 248070379
Merged-In: I15becc3306b5123144c39034bd064d68e520b056
Change-Id: I381fecef4d889daf865dd9a36e349044d25fd000

b2cdd9aa

Oct 03, 2022

Merge TP1A.221005.003 · 9631cab3

Xin Li authored 2 years ago

Merged-In: Ie06671a4a8bc857481c6c78362ce9fcaa7f3ba7e
Change-Id: Ic3683645e4290256d99e80e3e474014f380e5bf4

9631cab3

Sep 15, 2022

[automerger skipped] coral: update kernel-and-modules prebuilt [ DO NOT MERGE... · e9b5883f

Ken Huang authored 2 years ago

[automerger skipped] coral: update kernel-and-modules prebuilt [ DO NOT MERGE ] am: 41adc9ba am: cd3439b2 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19949373



Change-Id: Id94d29052a410ccc23c78bd2940989438c3a09d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e9b5883f

coral: update kernel-and-modules prebuilt [ DO NOT MERGE ] am: · cd3439b2

Ken Huang authored 2 years ago

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19949373

Change-Id: I9b3b7363f3649d9f2632d35420f881441b53e156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cd3439b2

coral: update kernel-and-modules prebuilt [ DO NOT MERGE ] · 41adc9ba

Ken Huang authored 2 years ago

Linux version 4.14.289-g3b72fa8e3a98-ab9066967 (android-
    build@abfarm-2004-0511) (Android (7284624, based on r416183b)
    clang version 12.0.5
    (https://android.googlesource.com/toolchain/llvm-project


    c935d99d7cf2016289302412d708641d52d2f7ee), LLD 12.0.5
    (/buildbot/src/android/llvm-toolchain/out/llvm-project/lld
    c935d99d7cf2016289302412d708641d52d2f7ee)) #1 SMP PREEMPT Thu Sep
    15 02:38:10 UTC 2022

private/msm-google: (3 changes)
  3b72fa8e fbdev: msm: check for valid fence before using objects
  7eecd325 msm: mdp3: fix the use after free problem
  7b1a1cc3 usb: dwc3: gadget: Fix null pointer exception

Bug: 228137851
Bug: 238117846
Bug: 238118608
Pick-Prebuilt: 474437523
Build-Id: 9066967
Processing-Config: kernel_headers
Change-Id: I9f819e69fc74f399619a3e43965d9e67bbd7d9a2
Signed-off-by: Ken Huang <kenbshuang@google.com>

41adc9ba

Sep 08, 2022

[automerger skipped] coral: update kernel-and-modules prebuilt am: ... · 9c0c8240

Jack Wu authored 2 years ago

[automerger skipped] coral: update kernel-and-modules prebuilt am: abe9b3b0 -s ours am: 7d00fc0b -s ours am: e3e12cf7 -s ours am: e964d1a4 -s ours

am skip reason: Merged-In I233dde4219fbab66ce0a75d068ea386a987f1edb with SHA-1 7302a395 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19896771



Change-Id: I87c757ac8fa25498498d4f1c604ddb67a3d52421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9c0c8240

[automerger skipped] coral: update kernel-and-modules prebuilt am: ... · 8ecc4606

Jack Wu authored 2 years ago

[automerger skipped] coral: update kernel-and-modules prebuilt am: abe9b3b0 -s ours am: 7d00fc0b -s ours am: e0f7048a -s ours am: 7fd66f21 -s ours

am skip reason: Merged-In I233dde4219fbab66ce0a75d068ea386a987f1edb with SHA-1 7302a395 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19896771



Change-Id: Icb631a917948b030fe80cc20b0f39ff6c02e86f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8ecc4606

[automerger skipped] coral: update kernel-and-modules prebuilt am: ... · 068952ea

Jack Wu authored 2 years ago

[automerger skipped] coral: update kernel-and-modules prebuilt am: abe9b3b0 -s ours am: bb254a02 -s ours am: be1d4799 -s ours am: 8cb437c4 -s ours

am skip reason: Merged-In I233dde4219fbab66ce0a75d068ea386a987f1edb with SHA-1 7302a395 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19896771



Change-Id: I91d24d64ff8659247d4af3ec917bd75cc0b892a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

068952ea

[automerger skipped] coral: update kernel-and-modules prebuilt am: ... · e964d1a4

Jack Wu authored 2 years ago

[automerger skipped] coral: update kernel-and-modules prebuilt am: abe9b3b0 -s ours am: 7d00fc0b -s ours am: e3e12cf7 -s ours

am skip reason: Merged-In I233dde4219fbab66ce0a75d068ea386a987f1edb with SHA-1 7302a395 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19896771



Change-Id: I1d43bbabb813990404f25aa7c15940e892858725
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e964d1a4

[automerger skipped] coral: update kernel-and-modules prebuilt am: ... · 7fd66f21

Jack Wu authored 2 years ago

[automerger skipped] coral: update kernel-and-modules prebuilt am: abe9b3b0 -s ours am: 7d00fc0b -s ours am: e0f7048a -s ours

am skip reason: Merged-In I233dde4219fbab66ce0a75d068ea386a987f1edb with SHA-1 7302a395 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19896771



Change-Id: I15e1abe5b46625739993a8965c63db23c17bdb78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7fd66f21

[automerger skipped] coral: update kernel-and-modules prebuilt am: ... · 8cb437c4

Jack Wu authored 2 years ago

[automerger skipped] coral: update kernel-and-modules prebuilt am: abe9b3b0 -s ours am: bb254a02 -s ours am: be1d4799 -s ours

am skip reason: Merged-In I233dde4219fbab66ce0a75d068ea386a987f1edb with SHA-1 7302a395 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19896771



Change-Id: I99d94904a9ec118878c03ba7761fee391ba3f6e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8cb437c4

[automerger skipped] coral: update kernel-and-modules prebuilt am: ... · e0f7048a

Jack Wu authored 2 years ago

[automerger skipped] coral: update kernel-and-modules prebuilt am: abe9b3b0 -s ours am: 7d00fc0b -s ours

am skip reason: Merged-In I233dde4219fbab66ce0a75d068ea386a987f1edb with SHA-1 7302a395 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19896771



Change-Id: I9acd72699e73242a58e34a4559c60965be08b0a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e0f7048a

[automerger skipped] coral: update kernel-and-modules prebuilt am: ... · e3e12cf7

Jack Wu authored 2 years ago

[automerger skipped] coral: update kernel-and-modules prebuilt am: abe9b3b0 -s ours am: 7d00fc0b -s ours

am skip reason: Merged-In I233dde4219fbab66ce0a75d068ea386a987f1edb with SHA-1 7302a395 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19896771



Change-Id: I25437133746541b8cae4a94b50972c5a2a79758d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e3e12cf7

[automerger skipped] coral: update kernel-and-modules prebuilt am: ... · 6f76fd5a

Jack Wu authored 2 years ago

[automerger skipped] coral: update kernel-and-modules prebuilt am: abe9b3b0 -s ours am: 2d22b32c -s ours

am skip reason: Merged-In I233dde4219fbab66ce0a75d068ea386a987f1edb with SHA-1 7302a395 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19896771



Change-Id: I452c86266065da85f326c2f760f2519de3fc3116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6f76fd5a

[automerger skipped] coral: update kernel-and-modules prebuilt am: ... · be1d4799

Jack Wu authored 2 years ago

[automerger skipped] coral: update kernel-and-modules prebuilt am: abe9b3b0 -s ours am: bb254a02 -s ours

am skip reason: Merged-In I233dde4219fbab66ce0a75d068ea386a987f1edb with SHA-1 7302a395 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19896771



Change-Id: Iaa48ae9a0e35bf3f2327fc9daa3cf14940b28eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

be1d4799

[automerger skipped] coral: update kernel-and-modules prebuilt am: -s ours · 7d00fc0b

Jack Wu authored 2 years ago

am skip reason: Merged-In I233dde4219fbab66ce0a75d068ea386a987f1edb with SHA-1 7302a395 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19896771

Change-Id: Id84ffe3b29f33985285d94e1cea282d51f536bc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7d00fc0b

[automerger skipped] coral: update kernel-and-modules prebuilt am: -s ours · 2d22b32c

Jack Wu authored 2 years ago

am skip reason: Merged-In I233dde4219fbab66ce0a75d068ea386a987f1edb with SHA-1 7302a395 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19896771

Change-Id: I3bdc1e11678922307e4bf291eba8b05e583c6d92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2d22b32c

[automerger skipped] coral: update kernel-and-modules prebuilt am: -s ours · bb254a02

Jack Wu authored 2 years ago

am skip reason: Merged-In I233dde4219fbab66ce0a75d068ea386a987f1edb with SHA-1 7302a395 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19896771

Change-Id: Ia0ffa4a316d110d790a8acadbf99c6d71e4c33d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bb254a02

coral: update kernel-and-modules prebuilt · abe9b3b0

Jack Wu authored 2 years ago

Linux version 4.14.276-ga97c0175aeb3-ab9040639 (android-
    build@abfarm-2004-0313) (Android (7284624, based on r416183b)
    clang version 12.0.5
    (https://android.googlesource.com/toolchain/llvm-project


    c935d99d7cf2016289302412d708641d52d2f7ee), LLD 12.0.5
    (/buildbot/src/android/llvm-toolchain/out/llvm-project/lld
    c935d99d7cf2016289302412d708641d52d2f7ee)) #1 SMP PREEMPT Thu Sep
    8 05:47:53 UTC 2022

private/msm-google: (1 change)
  a97c0175 Revert "google_charger: reset the DC AICL when current limit is disabled by thermal daemon"

Bug: 243683011
Pick-Prebuilt: 472886937
Build-Id: 9040639
Processing-Config: kernel_headers
Merged-In: I233dde4219fbab66ce0a75d068ea386a987f1edb
Change-Id: I297b55e62a4b8226e2567f0bb9e27b663533cc74
Signed-off-by: Jack Wu <wjack@google.com>

abe9b3b0

Aug 29, 2022

[automerger skipped] Merge "coral: update kernel-and-modules prebuilt [ DO NOT... · 8049323e

TreeHugger Robot authored 2 years ago

[automerger skipped] Merge "coral: update kernel-and-modules prebuilt [ DO NOT MERGE ]" into tm-qpr-dev am: c28b00fe am: 1e8b92e2 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19632698



Change-Id: Icde5df323ecb6aee2e757e089cc37b936f89719f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8049323e

[automerger skipped] coral: update kernel-and-modules prebuilt [ DO NOT MERGE... · dbefef23

Lucas Wei authored 2 years ago

[automerger skipped] coral: update kernel-and-modules prebuilt [ DO NOT MERGE ] am: 1f0fff50 am: c6c5623b -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19632698



Change-Id: I06590a2b499e1f965abb789f95137e4b87196684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

dbefef23

Merge "coral: update kernel-and-modules prebuilt [ DO NOT MERGE ]" into tm-qpr-dev am: · 1e8b92e2

TreeHugger Robot authored 2 years ago

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19632698

Change-Id: I7196f9571882ba44ad8673864db11b7d3548359d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1e8b92e2

coral: update kernel-and-modules prebuilt [ DO NOT MERGE ] am: · c6c5623b

Lucas Wei authored 2 years ago

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-kernel/+/19632698

Change-Id: I5a9d3b12a01661b8e6f63a1b0c9b38c371892fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c6c5623b

Merge "coral: update kernel-and-modules prebuilt [ DO NOT MERGE ]" into tm-qpr-dev · c28b00fe
TreeHugger Robot authored 2 years ago

c28b00fe

Aug 19, 2022
- Merge cherrypicks of [19591070] into tm-release. · 23efa57f
  Android Build Coastguard Worker authored 2 years ago
```
Change-Id: I928b7e7171ac6bd3f77520ba5f92b369a09e23cf
```
  6 tags
  
  23efa57f