summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-06-29[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵SecurityBot
MERGE ] am: 6e17ad06d7 am: 1c6301976e -s ours am: 62146a1fda -s ours am: d880ea089d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23125886 Change-Id: If39ae23ff4eb8497a9fdd5d09bf11962b955308c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵SecurityBot
MERGE ] am: 6e17ad06d7 -s ours am: fc00e3a66c -s ours am: 12d25b5334 -s ours am: 50fc52fc9d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23125886 Change-Id: I644f33d04f050427222674207a1751dd6e0257ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵SecurityBot
MERGE ] am: 6e17ad06d7 -s ours am: fc00e3a66c -s ours am: 6ec2a5e765 -s ours am: d3a7e06747 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23125886 Change-Id: I4c406a73c265342db1a1aaceb86f51fdc8d4458b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵SecurityBot
MERGE ] am: 6e17ad06d7 -s ours am: fc00e3a66c -s ours am: 12d25b5334 -s ours am: 607e2e8bad -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23125886 Change-Id: Ia83966de678bdee53bfc1185a649ed3cfb086969 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵SecurityBot
MERGE ] am: 6e17ad06d7 am: 1c6301976e -s ours am: 62146a1fda -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23125886 Change-Id: Ic9c0aeefb5d73348e6dcfa10967062fdc155b6cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵SecurityBot
MERGE ] am: 6e17ad06d7 -s ours am: fc00e3a66c -s ours am: 6ec2a5e765 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23125886 Change-Id: Ia5fb52f48e16ea836ce2ca0dda32f1783cef7c81 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵SecurityBot
MERGE ] am: 6e17ad06d7 -s ours am: fc00e3a66c -s ours am: 12d25b5334 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23125886 Change-Id: I7d9af212638e2c33cc8d0f532d5bdf1d2c18b872 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵SecurityBot
MERGE ] am: 6e17ad06d7 -s ours am: fc00e3a66c -s ours am: 12d25b5334 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23125886 Change-Id: Id302bb33444459cf8019860f267ae7b27f9f5806 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵SecurityBot
MERGE ] am: 6e17ad06d7 am: 1c6301976e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23125886 Change-Id: Ia809f92387a5e99e5169a81567aee7ecc07fd9e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵SecurityBot
MERGE ] am: 6e17ad06d7 -s ours am: fc00e3a66c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23125886 Change-Id: I4e30e5fdbf188219eec28e125ec08dd3e53315d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵SecurityBot
MERGE ] am: 6e17ad06d7 -s ours am: fc00e3a66c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23125886 Change-Id: I07e2270ac87e39480a53df6ebe4698b5f0e414d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ] am: 6e17ad06d7SecurityBot
Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23125886 Change-Id: I7c3e0c7c5e3e8c89c8f6b703b1d061e893380025 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵SecurityBot
MERGE ] am: 6e17ad06d7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23125886 Change-Id: I6e24cbb648f7cb242c844704f41730c1aee471d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ]SecurityBot
Linux version 4.14.302-g6ff6ddc33f7d-ab10092322 (android- build@abfarm-2004-4012) (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 Tue May 9 09:35:06 UTC 2023 private/msm-google: (1 change) 6ff6ddc3 arm64: configs: sunfish: Remove CONFIG_BT_LE and CONFIG_BT_BREDR private/msm-google-modules/wlan/qca-wifi-host-cmn: (1 change) d7cc06c5 qcacmn: Check cookie and avoid to read out of bound private/msm-google-modules/wlan/qcacld-3.0: (1 change) dfd3a642 qcacld-3.0: Fix out-of-bounds in tx_stats Bug: 255028881 Bug: 276750246 Bug: 276750665 Pick-Prebuilt: 544208456 Build-Id: 10092322 Processing-Config: kernel_headers Change-Id: I4514f8318db8a685d743d84e68f78e6521af9d91 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-05-05[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Pindar Yang
MERGE ] am: 910038e58c -s ours am: 62d6c335d2 -s ours am: b12981a097 -s ours am: ec92f723e5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23011464 Change-Id: I77477cf9c860b74b7aa174e5ef1d65b82f9d1806 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Pindar Yang
MERGE ] am: 910038e58c -s ours am: 62d6c335d2 -s ours am: b12981a097 -s ours am: 726404cb4b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23011464 Change-Id: I0ffa944a81462c76ee855657ea36eabd3f46eb34 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Pindar Yang
MERGE ] am: 910038e58c am: c80e6f39d4 -s ours am: 840dbf8ba5 -s ours am: 4b93d8eac5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23011464 Change-Id: I9b9858d10b29810e79244ac663363980424d8e81 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Pindar Yang
MERGE ] am: 910038e58c -s ours am: 62d6c335d2 -s ours am: f0fd590103 -s ours am: 9ca6c02a3e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23011464 Change-Id: I94636ed753cc39201236753eab53f0fa06fc1023 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Pindar Yang
MERGE ] am: 910038e58c -s ours am: 62d6c335d2 -s ours am: b12981a097 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23011464 Change-Id: Ie3c8c766b9c1ea1b8f6d7035e8e149f766aa5d32 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Pindar Yang
MERGE ] am: 910038e58c -s ours am: 62d6c335d2 -s ours am: b12981a097 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23011464 Change-Id: I9cf4c5197d4fedf2256ef508478ccb280071276a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Pindar Yang
MERGE ] am: 910038e58c am: c80e6f39d4 -s ours am: 840dbf8ba5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23011464 Change-Id: I2dfb3c8fab75dc3e8f8541cf9ebef605f2f75468 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Pindar Yang
MERGE ] am: 910038e58c -s ours am: 62d6c335d2 -s ours am: f0fd590103 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23011464 Change-Id: Ib7a4fbc695ac00062779411bb883fb406590ca0b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Pindar Yang
MERGE ] am: 910038e58c -s ours am: 62d6c335d2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23011464 Change-Id: I119302d861620693d6a325aadef461b3ceb4649a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Pindar Yang
MERGE ] am: 910038e58c am: c80e6f39d4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23011464 Change-Id: Ib05989857d9671293ddca91db6a794e0903aa319 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Pindar Yang
MERGE ] am: 910038e58c -s ours am: 62d6c335d2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23011464 Change-Id: I7e3a6fd615a0ccd628e18bce3f1ff2d3bcf56df1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ] am: 910038e58cPindar Yang
Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23011464 Change-Id: Ica5b25c1aab314448f95237f5cc79162657b9361 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵android14-devPindar Yang
MERGE ] am: 910038e58c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/23011464 Change-Id: I409ce1f26600cce61758768402eb3d406fb5d083 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ]Pindar Yang
Linux version 4.14.302-gb79165aecc6b-ab10057958 (android- build@abfarm-2004-0404) (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 Wed May 3 09:24:11 UTC 2023 private/msm-google: (2 changes) b79165ae Merge branch 'android-msm-pixel-4.14-tm-security' into android-msm-pixel-4.14-tm-qpr3 0ab20f16 net: qrtr: fifo: Add bounds check on tx path Bug: 276750306 Pick-Prebuilt: 529230692 Build-Id: 10057958 Processing-Config: kernel_headers Change-Id: Iacb6cc99d0651dc5650f7411f327c2a320111690 Signed-off-by: Pindar Yang <pindaryang@google.com>
2023-04-22[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Harrison Lingren
MERGE ] am: d4fee771fa -s ours am: 44f738e3b4 -s ours am: 6f2a1c273e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/22789781 Change-Id: Icd947de7d24187814903aebc819dc6001487f078 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Harrison Lingren
MERGE ] am: d4fee771fa -s ours am: 44f738e3b4 -s ours am: 3cb01436a4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/22789781 Change-Id: Icfcb5e8b42f1834006b297db02c246d9244791a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Harrison Lingren
MERGE ] am: d4fee771fa -s ours am: 44f738e3b4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/22789781 Change-Id: I06fe563e0c93fbe25ce2439d1ad50aac8c27f06e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Harrison Lingren
MERGE ] am: d4fee771fa -s ours am: 44f738e3b4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/22789781 Change-Id: Ida882d189c88b2a3928dfd86a38fe92ff4d3acc6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22[automerged blank] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Presubmit Automerger Backend
MERGE ] 2p: d4fee771fa 2p: 4e3de52241 am: 4e80ea0c15 Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/22789781 Change-Id: I58fbc197d81dc08378d4193fa37350ccade889d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Harrison Lingren
MERGE ] am: d4fee771fa -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/22789781 Change-Id: I6f80ae26bade00a39a66a5c110b932a8b16bdfe7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21[automerged blank] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵Presubmit Automerger Backend
MERGE ] 2p: d4fee771fa 2p: 4e3de52241 Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/22789781 Bug: 264471096 Bug: 276750663 Change-Id: Ibc2d79311e599fd26881e5de9ee8e3263229690e
2023-04-21[automerge] sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ] 2p: ↵Presubmit Automerger Backend
d4fee771fa Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/22789781 Bug: 264471096 Bug: 276750663 Change-Id: I46e7973985a67a746bbf785ede11bc6beca396f2
2023-04-21sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ]Harrison Lingren
Linux version 4.14.302-g1c5bb331fccc-ab9989803 (android- build@abfarm-2004-5348) (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 Fri Apr 21 19:27:44 UTC 2023 private/msm-google: (1 change) 1c5bb331 msm: kgsl: Keep postamble packets in a privileged buffer Bug: 264471096 Bug: 276750663 Pick-Prebuilt: 523680357 Build-Id: 9989803 Processing-Config: kernel_headers Change-Id: I6ca60d97329fd45f242e3d168b7f787cf2e4913d Signed-off-by: Harrison Lingren <hlingren@google.com>
2023-04-18Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994temp_275386652Xin Li
Bug: 275386652 Merged-In: I0c90b3c776c6da1fa64afae3f7dc3a039bc9c75e Change-Id: I0dc077c3e9e33315e524603a1ee9cfa5fccdb017
2023-03-24[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵JJ Lee
MERGE ] am: e635018c0f am: f4cfba164c -s ours am: 6157fff96b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/22235605 Change-Id: Iedb104f434c5ecadce22b813385f21f17dc1531d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵JJ Lee
MERGE ] am: e635018c0f am: f4cfba164c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/22235605 Change-Id: I1b268c8cea1889e34a3aa4948708a1714ea32bca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ] am: e635018c0fJJ Lee
Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/22235605 Change-Id: I53ec291563cda1acb4731b6c2f13e778badf68d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ]JJ Lee
Linux version 4.14.302-ge64be25303f5-ab9800122 (android- build@abfarm-2004-0508) (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 Mar 23 09:45:15 UTC 2023 private/msm-google: (11 changes) e64be253 Revert "ASoC: ops: Fix bounds check for _sx controls" 47687fad Merge android-msm-pixel-4.14-tm-qpr2 into android-msm-pixel-4.14-tm-qpr3 503ccf8a Merge branch 'android-msm-pixel-4.14-tm-security' into android-msm-pixel-4.14-tm-qpr2 d2d18657 msm: kgsl: Use dma_buf_get() to get dma_buf structure de68cf35 msm: kgsl: Make sure that pool pages don't have any extra references ebafd53b Merge branch 'android-msm-pixel-4.14-tm-security' into android-msm-pixel-4.14-tm-qpr2 7b88c565 diag: Validate the dci client before sending dci packet 0479b2d4 media: dvb-core: Fix UAF due to refcount races at releasing 84b42e6a Merge branch 'android-msm-pixel-4.14-tm-security' into android-msm-pixel-4.14-tm-qpr2 b0c425a2 ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF cd289179 ANDROID: usb: f_accessory: Check buffer size when initialised via composite Bug: 235114749 Bug: 248356119 Bug: 260597977 Bug: 264029575 Bug: 265303544 Bug: 267318088 Bug: 271879598 Bug: 271879644 Bug: 274159836 Bug: 274412043 Pick-Prebuilt: 519058489 Build-Id: 9800122 Processing-Config: kernel_headers Change-Id: I0c90b3c776c6da1fa64afae3f7dc3a039bc9c75e Signed-off-by: JJ Lee <leejj@google.com>
2023-02-14Merge TQ2A.230305.008temp_273316506_tm-qpr2Xin Li
Bug: 264720040 Merged-In: Ie982be42e1ab209e0ef1235aafda327f8c2c71d1 Change-Id: I40ff1b8ca704e671b535976164ebe8121c9afe20
2023-02-07[automerger skipped] sunfish: update kernel-and-modules prebuilt [ DO NOT ↵SecurityBot
MERGE ] am: 40af980ce4 am: 63fb6f0b21 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/21280840 Change-Id: I4b950139e57be64cab7a7d92870d6e933f5f2787 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-07sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ] am: 40af980ce4SecurityBot
Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/21280840 Change-Id: I694bcb279ec11129e45f987017b8db1dd4f6a45e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-05sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ]SecurityBot
Linux version 4.14.302-g31bb085c1313-ab9563959 (android- build@abfarm-2004-5066) (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 Sat Feb 4 08:28:35 UTC 2023 kernel/private/tests/patchwork: (1 change) 39439c25 patchwork: Specify the macros BIT and GENMASK private/msm-google: (500 changes) 31bb085c LTS: Merge android-4.14-stable (4.14.302) into android-msm-pixel-4.14-tm-qpr3 9d49a24a BACKPORT: UPSTREAM: loop: allow user to set the queue depth 874eade5 UPSTREAM: loop: Select I/O scheduler 'none' from inside add_disk() d763380c BACKPORT: UPSTREAM: blk-mq: Introduce the BLK_MQ_F_NO_SCHED_BY_DEFAULT flag 4accad76 Merge android-4.14-stable (4.14.302) into android-msm-pixel-4.14-tm-lts 3547aebe Merge android-msm-pixel-4.14-tm-qpr1 into android-msm-pixel-4.14-tm-qpr2 d37ce01b Merge 4.14.302 into android-4.14-stable c4215ee4 Linux 4.14.302 be1f943b net: mvneta: Fix an out of bounds check b3d7ff8c ipv6: avoid use-after-free in ip6_fragment() 1abdb3e1 net: plip: don't call kfree_skb/dev_kfree_skb() under spin_lock_irq() 572f47fe xen/netback: fix build warning cb1e293f ethernet: aeroflex: fix potential skb leak in greth_init_rings() abf037ca tipc: Fix potential OOB in tipc_link_proto_rcv() 8067cd24 net: hisilicon: Fix potential use-after-free in hix5hd2_rx() 196e1267 net: hisilicon: Fix potential use-after-free in hisi_femac_rx() 36307192 net: stmmac: fix "snps,axi-config" node property parsing dbdcfb9f NFC: nci: Bounds check struct nfc_target arrays 47a1a2f6 net: mvneta: Prevent out of bounds read in mvneta_config_rss() b7af8f3e net: encx24j600: Fix invalid logic in reading of MISTAT register 8a5599c2 net: encx24j600: Add parentheses to fix precedence 9980a3ea mac802154: fix missing INIT_LIST_HEAD in ieee802154_if_add() 88ec63de Bluetooth: 6LoWPAN: add missing hci_dev_put() in get_l2cap_conn() 1585997c igb: Allocate MSI-X vector when testing 057ddc8d e1000e: Fix TX dispatch condition 71d591ef gpio: amd8111: Fix PCI device reference count leak 30f48686 ca8210: Fix crash by zero initializing data dcdf3312 ieee802154: cc2520: Fix error return code in cc2520_hw_init() 809783f8 HID: core: fix shift-out-of-bounds in hid_report_raw_event b8f91e42 HID: hid-lg4ff: Add check for empty lbuf cd331f7b KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field b77600e2 memcg: fix possible use-after-free in memcg_write_event_control() a2b56627 media: v4l2-dv-timings.c: fix too strict blanking sanity checks d9c76749 rcutorture: Automatically create initrd directory 2b81c566 xen/netback: don't call kfree_skb() with interrupts disabled ff3f010d xen/netback: do some code cleanup e173cefc xen/netback: Ensure protocol headers don't fall in the non-linear area fba11fb6 net: usb: qmi_wwan: add u-blox 0x1342 composition 24e846a1 regulator: twl6030: fix get status of twl6032 regulators d4dd21a7 ASoC: soc-pcm: Add NULL check in BE reparenting e3853607 ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event 992a37d8 ARM: dts: rockchip: disable arm_global_timer on rk3066 and rk3188 791d3a53 ARM: 9266/1: mm: fix no-MMU ZERO_PAGE() implementation 8e519b09 ARM: 9251/1: perf: Fix stacktraces for tracepoint events in THUMB2 kernels 70ebc092 ARM: dts: rockchip: fix ir-receiver node names 44e412ff arm: dts: rockchip: fix node name for hym8563 rtc 394a0027 Merge android-4.14-stable (4.14.299) into android-msm-pixel-4.14-tm-lts 776e1655 Merge branch 'android-msm-pixel-4.14-tm-security' into android-msm-pixel-4.14-tm-qpr1 8e45015c Merge 4.14.301 into android-4.14-stable 65afe34a Linux 4.14.301 369e65de Revert "x86/speculation: Change FILL_RETURN_BUFFER to work with objtool" 30b541df x86/nospec: Fix i386 RSB stuffing 39a60b24 ipc/sem: Fix dangling sem_array access in semtimedop race 72d35aa8 v4l2: don't fall back to follow_pfn() if pin_user_pages_fast() fails dad6ca55 proc: proc_skip_spaces() shouldn't think it is working on C strings 4f4ff21b proc: avoid integer type confusion in get_proc_long f60b9ea2 mmc: sdhci: Fix voltage switch delay 99c3d73a mmc: sdhci: use FIELD_GET for preset value bit masks efebc8e1 x86/ioremap: Fix page aligned size calculation in __ioremap_caller() 9f4624c4 Bluetooth: L2CAP: Fix accepting connection request for invalid SPSM 8055cd48 x86/pm: Add enumeration check before spec MSRs save/restore setup ce2bc7df x86/tsx: Add a feature bit for TSX control MSR support 397ab6fb nvme: restrict management ioctls to admin 205c1e9a tcp/udp: Fix memory leak in ipv6_renew_options(). 71c4a621 iommu/vt-d: Fix PCI device refcount leak in dmar_dev_scope_init() e703b11c pinctrl: single: Fix potential division by zero 4a95a49f ASoC: ops: Fix bounds check for _sx controls 4ddc92bf efi: random: Properly limit the size of the random seed a6d363d4 arm64: errata: Fix KVM Spectre-v2 mitigation selection for Cortex-A57/A72 9e8261df arm64: Fix panic() when Spectre-v2 causes Spectre-BHB to re-allocate KVM vectors 50864ab2 x86/bugs: Make sure MSR_SPEC_CTRL is updated properly upon resume from S3 165c7a3b nilfs2: fix NULL pointer dereference in nilfs_palloc_commit_free_entry() a2a5d66f tools/vm/slabinfo-gnuplot: use "grep -E" instead of "egrep" 3c98e91b btrfs: qgroup: fix sleep from invalid context bug in btrfs_qgroup_inherit() 86a4ce25 perf: Add sample_flags to indicate the PMU-filled sample data 0dd1da5a hwmon: (coretemp) fix pci device refcount leak in nv1a_ram_new() 070d5ea4 hwmon: (coretemp) Check for null before removing sysfs attrs 7a411928 net: ethernet: renesas: ravb: Fix promiscuous mode after system resumed adec13f1 packet: do not set TP_STATUS_CSUM_VALID on CHECKSUM_COMPLETE 4b351609 net: hsr: Fix potential use-after-free d0c5cbbb dsa: lan9303: Correct stat name ded89396 net/9p: Fix a potential socket leak in p9_socket_open ea54ea65 net: net_netdev: Fix error handling in ntb_netdev_init_module() 51d7f6b2 net: phy: fix null-ptr-deref while probe() failed 6841e950 qlcnic: fix sleep-in-atomic-context bugs caused by msleep 521c3302 can: cc770: cc770_isa_probe(): add missing free_cc770dev() 1ebe1dd8 can: sja1000_isa: sja1000_isa_probe(): add missing free_sja1000dev() adaafbf2 net/mlx5: Fix uninitialized variable bug in outlen_write() 3f49290b of: property: decrement node refcount in of_fwnode_get_reference_args() 79819827 hwmon: (ibmpex) Fix possible UAF when ibmpex_register_bmc() fails 216b9aaf hwmon: (i5500_temp) fix missing pci_disable_device() 134ea13b iio: light: rpr0521: add missing Kconfig dependencies 113c0803 iio: health: afe4404: Fix oob read in afe4404_[read|write]_raw c9268df3 iio: health: afe4403: Fix oob read in afe4403_read_raw dcbd12fd drm/amdgpu: always register an MMU notifier for userptr a4f9fc65 net: usb: qmi_wwan: add Telit 0x103a composition 22a38491 tcp: configurable source port perturb table size 50dbec83 platform/x86: hp-wmi: Ignore Smart Experience App event c94dcfe4 platform/x86: acer-wmi: Enable SW_TABLET_MODE on Switch V 10 (SW5-017) 43d275ac platform/x86: asus-wmi: add missing pci_dev_put() in asus_wmi_set_xusb2pr() 1b23d4a0 xen/platform-pci: add missing free_irq() in error path 20862f9f serial: 8250: 8250_omap: Avoid RS485 RTS glitch on ->set_termios() b81b2a82 Input: synaptics - switch touchpad on HP Laptop 15-da3001TU to RMI mode 9a59a38c nilfs2: fix nilfs_sufile_mark_dirty() not set segment usage as dirty 07d7941f kconfig: display recursive dependency resolution hint just once e4ff6063 iio: core: Fix entry not deleted when iio_register_sw_trigger_type() fails 1e28ce14 iio: light: apds9960: fix wrong register for gesture gain 6b49b807 arm64: dts: rockchip: lower rk3399-puma-haikou SD controller clock frequency 41dd82cf nios2: add FORCE for vmlinuz.gz 772af189 s390/crashdump: fix TOD programmable field size 171b12df net: thunderx: Fix the ACPI memory leak 606b3b2e nfc: st-nci: fix memory leaks in EVT_TRANSACTION 6f851b08 nfc: st-nci: fix incorrect validating logic in EVT_TRANSACTION 0086683e s390/dasd: fix no record found for raw_track_access 170fd360 dccp/tcp: Reset saddr on failure after inet6?_hash_connect(). 03b93946 NFC: nci: fix memory leak in nci_rx_data_packet() f65a7115 xfrm: Fix ignored return value in xfrm6_init() a3a25dd1 net/qla3xxx: fix potential memleak in ql3xxx_send() c3bbd871 net/mlx4: Check retval of mlx4_bitmap_init eaaebb02 ARM: mxs: fix memory leak in mxs_machine_init() b2603d9f 9p/fd: fix issue of list_del corruption in p9_fd_cancel() f6255f34 net: pch_gbe: fix potential memleak in pch_gbe_tx_queue() 04459a2d nfc/nci: fix race with opening and closing 36459a26 ARM: dts: at91: sam9g20ek: enable udc vbus gpio pinctrl 6d8664d4 bus: sunxi-rsb: Support atomic transfers 98a2e538 ARM: dts: am335x-pcm-953: Define fixed regulators in root node 2f2ed8f6 af_key: Fix send_acquire race with pfkey_register 827c256b MIPS: pic32: treat port as signed integer f2f5ab9c spi: stm32: fix stm32_spi_prepare_mbr() that halves spi clk for every run eeb02bda wifi: mac80211: Fix ack frame idr leak when mesh has no route 97ec1ec3 audit: fix undefined behavior in bit shift for AUDIT_BIT 37fda09f wifi: mac80211_hwsim: fix debugfs attribute ps with rc table support 980d7f36 Merge 4.14.300 into android-4.14-stable 179ef7fe Linux 4.14.300 86f36de1 ntfs: check overflow when iterating ATTR_RECORDs 801906ee ntfs: fix out-of-bounds read in ntfs_attr_find() fb2004ba ntfs: fix use-after-free in ntfs_attr_find() 04db8e4f mm: fs: initialize fsdata passed to write_begin/write_end interface 9f855461 9p/trans_fd: always use O_NONBLOCK read/write aa9ac2ad gfs2: Switch from strlcpy to strscpy 1ad19709 gfs2: Check sb_bsize_shift after reading superblock e3031280 9p: trans_fd/p9_conn_cancel: drop client lock earlier 22f6b5d4 kcm: close race conditions on sk_receive_queue 047824a7 bpf, test_run: Fix alignment problem in bpf_prog_test_run_skb() 381b6cb3 kcm: avoid potential race in kcm_tx_work 40260339 tcp: cdg: allow tcp_cdg_release() to be called multiple times d2fee7d1 macvlan: enforce a consistent minimal mtu fe517db0 serial: 8250: Flush DMA Rx on RLSI 39a3ed68 nilfs2: fix use-after-free bug of ns_writer on remount f04586c2 misc/vmw_vmci: fix an infoleak in vmci_host_do_receive_datagram() 7570e5b5 mmc: sdhci-pci: Fix possible memory leak caused by missing pci_dev_put() d8610203 mmc: core: properly select voltage range without power cycle b0d01775 serial: 8250_lpss: Configure DMA also w/o DMA filter cc19663d serial: 8250: Fall back to non-DMA Rx if IIR_RDI occurs 6a818db0 dm ioctl: fix misbehavior if list_versions races with module loading e59a9491 iio: pressure: ms5611: changed hardcoded SPI speed to value limited 5a39382a iio: trigger: sysfs: fix possible memory leak in iio_sysfs_trig_init() a0d98ae5 iio: adc: at91_adc: fix possible memory leak in at91_adc_allocate_trigger() 88f4f15b usb: chipidea: fix deadlock in ci_otg_del_timer a85bffde usb: add NO_LPM quirk for Realforce 87U Keyboard 1cb10f5f USB: serial: option: add Fibocom FM160 0x0111 composition e6c2705b USB: serial: option: add u-blox LARA-L6 modem 42a9dec9 USB: serial: option: add u-blox LARA-R6 00B modem 84ff5052 USB: serial: option: remove old LARA-R6 PID d9012497 USB: serial: option: add Sierra Wireless EM9191 368a01e5 ALSA: usb-audio: Drop snd_BUG_ON() from snd_usbmidi_output_open() 4c9338db ring_buffer: Do not deactivate non-existant pages 665b4c66 ftrace: Fix null pointer dereference in ftrace_add_mod() 7eb7b342 ftrace: Optimize the allocation for mcount entries c07fd111 ftrace: Fix the possible incorrect kernel message fd13959a cifs: Fix wrong return value checking when GETFLAGS dfcfbe4f net/x25: Fix skb leak in x25_lapb_receive_frame() fc1897f1 drbd: use after free in drbd_create_device() 7ed540bc xen/pcpu: fix possible memory leak in register_pcpu() 93d0af10 net: caif: fix double disconnect client in chnl_net_open() 81db4f18 mISDN: fix misuse of put_device() in mISDN_register_device() b119bedb mISDN: fix possible memory leak in mISDN_dsp_element_register() 4dfb4d30 net: bgmac: Drop free_netdev() from bgmac_enet_remove() b4d9f55c pinctrl: devicetree: fix null pointer dereferencing in pinctrl_dt_to_map 326629b4 parport_pc: Avoid FIFO port location truncation 53699e24 block: sed-opal: kmalloc the cmd/resp buffers c1dfa6b6 ASoC: soc-utils: Remove __exit for snd_soc_util_exit() 3bded462 tty: n_gsm: fix sleep-in-atomic-context bug in gsm_control_send 289c86be serial: 8250: omap: Flush PM QOS work on remove 96c88e44 serial: 8250_omap: remove wait loop from Errata i202 workaround 90bbdf30 ASoC: core: Fix use-after-free in snd_soc_exit() a6d2597e Bluetooth: L2CAP: Fix l2cap_global_chan_by_psm 3849d17b drm/imx: imx-tve: Fix return type of imx_tve_connector_mode_valid 07cd56cb selftests/futex: fix build for clang 3f235279 x86/cpu: Restore AMD's DE_CFG MSR after resume 0e196cfa dmaengine: at_hdmac: Check return code of dma_async_device_register f884fc78 dmaengine: at_hdmac: Fix impossible condition 92fa9787 dmaengine: at_hdmac: Don't allow CPU to reorder channel enable e51c0a0d dmaengine: at_hdmac: Fix completion of unissued descriptor in case of errors 732f3b9e dmaengine: at_hdmac: Don't start transactions at tx_submit level 247d3456 dmaengine: at_hdmac: Fix at_lli struct definition aad1e54a cert host tools: Stop complaining about deprecated OpenSSL functions f1517721 udf: Fix a slab-out-of-bounds write bug in udf_find_entry() ba18765d btrfs: selftests: fix wrong error check in btrfs_free_dummy_root() 648e2ce1 platform/x86: hp_wmi: Fix rfkill causing soft blocked wifi 24bd360f drm/i915/dmabuf: fix sg_table handling in map_dma_buf 8b4506cf nilfs2: fix deadlock in nilfs_count_free_blocks() ee7edf90 ALSA: usb-audio: Add quirk entry for M-Audio Micro bb0ac8d5 ALSA: hda: fix potential memleak in 'add_widget_node' 493bb641 arm64: efi: Fix handling of misaligned runtime regions and drop warning 21d3a8b6 net: macvlan: fix memory leaks of macvlan_common_newlink 6b9c9d2e net: mv643xx_eth: disable napi when init rxq or txq failed in mv643xx_eth_open() 0554bb01 ethernet: s2io: disable napi when start nic failed in s2io_card_up() 96223525 net: cxgb3_main: disable napi when bind qsets failed in cxgb_up() 9ffbc791 drivers: net: xgene: disable napi when register irq failed in xgene_enet_open() 4b6641c3 dmaengine: mv_xor_v2: Fix a resource leak in mv_xor_v2_remove() a0ead1d6 tipc: fix the msg->req tlv len check in tipc_nl_compat_name_table_dump_header 0f85b7ae ipv6: addrlabel: fix infoleak when sending struct ifaddrlblmsg to network 8821398f drm/vc4: Fix missing platform_unregister_drivers() call in vc4_drm_register() da3b101d hamradio: fix issue of dev reference count leakage in bpq_device_event() 81300125 net: lapbether: fix issue of dev reference count leakage in lapbeth_device_event() 65b0bc7a capabilities: fix undefined behavior in bit shift for CAP_TO_MASK 5cd21815 net: fman: Unregister ethernet device on removal a8ac13e0 bnxt_en: fix potentially incorrect return value for ndo_rx_flow_steer 0a9f56e5 net: gso: fix panic on frag_list with mixed head alloc types 249b7438 HID: hyperv: fix possible memory leak in mousevsc_probe() 3bea31c2 video: fbdev: pxa3xx-gcu: Fix integer overflow in pxa3xx_gcu_write d4bf190c msm: ADSPRPC: Restrict untrusted applications from attaching to GuestOS 67306c57 msm: camera: eeprom: Add OOB read check for eeprom memory map d393f881 msm: camera: memmgr: update correct length in bufq e0d94572 Merge 4.14.299 into android-4.14-stable d3693c5e Merge 4.14.298 into android-4.14-stable e911713e Linux 4.14.299 b23665bb wifi: brcmfmac: Fix potential buffer overflow in brcmf_fweh_event_worker() 8b09c0c7 linux/bits.h: make BIT(), GENMASK(), and friends available in assembly 6bd6be68 linux/const.h: move UL() macro to include/linux/const.h 0ad721c2 linux/const.h: prefix include guard of uapi/linux/const.h with _UAPI 13156b25 KVM: x86: emulator: update the emulation mode after CR0 write e232e74a KVM: x86: emulator: introduce emulator_recalc_and_set_mode 03dce7d5 KVM: x86: emulator: em_sysexit should update ctxt->mode 838852ad KVM: x86: Mask off reserved bits in CPUID.80000008H c3bf1e95 ext4: fix warning in 'ext4_da_release_space' a9d9183d parisc: Export iosapic_serial_irq() symbol for serial port driver 72cdf34a parisc: Make 8250_gsc driver dependend on CONFIG_PARISC 700485f7 efi: random: reduce seed size to 32 bytes ad906433 ALSA: usb-audio: Add quirks for MacroSilicon MS2100/MS2106 devices 6bb00eb2 capabilities: fix potential memleak on error path from vfs_getxattr_alloc() 87830662 tcp/udp: Make early_demux back namespacified. 7907466f btrfs: fix type of parameter generation in btrfs_get_dentry 79379ab3 block, bfq: protect 'bfqd->queued' by 'bfqd->lock' 999d99c8 Bluetooth: L2CAP: Fix attempting to access uninitialized memory eb0393cd i2c: xiic: Add platform module alias dbf15585 media: dvb-frontends/drxk: initialize err to 0 fc0f76dd media: s5p_cec: limit msg.len to CEC_MAX_MSG_SIZE 0d38b4ca net, neigh: Fix null-ptr-deref in neigh_table_clear() 7006176a net: mdio: fix undefined behavior in bit shift for __mdiobus_register 17c61648 Bluetooth: L2CAP: fix use-after-free in l2cap_conn_del() 03af22e2 Bluetooth: L2CAP: Fix use-after-free caused by l2cap_reassemble_sdu 3f58283d btrfs: fix ulist leaks in error paths of qgroup self tests b1dc9019 btrfs: fix inode list leak during backref walking at resolve_indirect_refs() 375facf8 isdn: mISDN: netjet: fix wrong check of device registration 080aabfb mISDN: fix possible memory leak in mISDN_register_device() bbc03d74 rose: Fix NULL pointer dereference in rose_send_frame() b48ac374 ipvs: use explicitly signed chars a238cdcf net: sched: Fix use after free in red_enqueue() e7cc20ec ata: pata_legacy: fix pdc20230_set_piomode() ea623722 net: fec: fix improper use of NETDEV_TX_BUSY 825656ae nfc: nfcmrvl: Fix potential memory leak in nfcmrvl_i2c_nci_send() 1938b290 nfc: s3fwrn5: Fix potential memory leak in s3fwrn5_nci_send() 935b4beb net: dsa: Fix possible memory leaks in dsa_loop_init() aae35a0c nfs4: Fix kmemleak when allocate slot failed 21c81cb4 NFSv4.1: We must always send RECLAIM_COMPLETE after a reboot 2fa90612 NFSv4.1: Handle RECLAIM_COMPLETE trunking errors 79b5f314 UPSTREAM: linux/const.h: move UL() macro to include/linux/const.h 94bab7bb UPSTREAM: linux/const.h: prefix include guard of uapi/linux/const.h with _UAPI 837e882e UPSTREAM: linux/bits.h: make BIT(), GENMASK(), and friends available in assembly a901bb6c Linux 4.14.298 a234f138 can: rcar_canfd: rcar_canfd_handle_global_receive(): fix IRQ storm on global FIFO receive e089cddb net: ehea: fix possible memory leak in ehea_register_port() b1c153fe openvswitch: switch from WARN to pr_warn 15ae48e1 ALSA: aoa: Fix I2S device accounting 802532a5 ALSA: aoa: i2sbus: fix possible memory leak in i2sbus_add_dev() 6151e822 PM: domains: Fix handling of unavailable/disabled idle states f0eed3a0 net: ksz884x: fix missing pci_disable_device() on error in pcidev_init() e76cd42e i40e: Fix flow-type by setting GL_HASH_INSET registers 80de8836 i40e: Fix ethtool rx-flow-hash setting for X722 f5a9f967 media: videodev2.h: V4L2_DV_BT_BLANKING_HEIGHT should check 'interlaced' 3d43b2b8 media: v4l2-dv-timings: add sanity checks for blanking values b0e20af2 media: vivid: dev->bitmap_cap wasn't freed in all cases e8347a44 media: vivid: s_fbuf: add more sanity checks 7952605f PM: hibernate: Allow hybrid sleep to work with s2idle b711db2a can: mscan: mpc5xxx: mpc5xxx_can_probe(): add missing put_clock() in error path cb280784 tcp: fix indefinite deferral of RTO with SACK reneging 8fb31d78 net: lantiq_etop: don't free skb when returning NETDEV_TX_BUSY 9ae47f11 kcm: annotate data-races around kcm->rx_wait bf46af73 kcm: annotate data-races around kcm->rx_psock 479b2325 amd-xgbe: add the bit rate quirk for Molex cables 2caeb6bd amd-xgbe: fix the SFP compliance codes check for DAC cables 7706fc3a x86/unwind/orc: Fix unreliable stack dump with gcov 0f8e9a15 ALSA: ac97: fix possible memory leak in snd_ac97_dev_register() 87bb275e arc: iounmap() arg is volatile 22d94334 drm/msm: Fix return type of mdp4_lvds_connector_mode_valid 0ba32d40 net: ieee802154: fix error return code in dgram_bind() 629c986e mm,hugetlb: take hugetlb_lock before decrementing h->resv_huge_pages 49bb053b xen/gntdev: Prevent leaking grants f37fae69 Xen/gntdev: don't ignore kernel unmapping error 71c3b012 s390/futex: add missing EX_TABLE entry to __futex_atomic_op() 02eb3513 kernfs: fix use-after-free in __kernfs_remove b3275dde mmc: core: Fix kernel panic when remove non-standard SDIO card e8f916b8 drm/msm/hdmi: fix memory corruption with too many bridges 7a99ef07 mac802154: Fix LQI recording 3f40852d fbdev: smscufx: Fix several use-after-free bugs 0acf3be1 iio: light: tsl2583: Fix module unloading b6749c3d tools: iio: iio_utils: fix digit calculation f0de3947 xhci: Remove device endpoints from bandwidth list when freeing the device a6ad4d7d usb: xhci: add XHCI_SPURIOUS_SUCCESS to ASM1042 despite being a V0.96 controller e88d42ee usb: bdc: change state when port disconnected ca1187ea usb: dwc3: gadget: Don't set IMI for no_interrupt 6ae382fd USB: add RESET_RESUME quirk for NVIDIA Jetson devices in RCM 985e7db4 ALSA: au88x0: use explicitly signed char fd68a752 ALSA: Use del_timer_sync() before freeing timer 95d49746 ACPI: video: Force backlight native for more TongFang devices 7339b6bd media: v4l2-mem2mem: Apply DST_QUEUE_OFF_BASE on MMAP buffers across ioctls 749bea54 iommu/vt-d: Clean up si_domain in the init_dmars() error path 3b78453c net: hns: fix possible memory leak in hnae_ae_register() 726e4d16 net/atm: fix proc_mpc_write incorrect return value 0b127ae5 HID: magicmouse: Do not set BTN_MOUSE on double report 1e1c94a9 ACPI: extlog: Handle multiple records df36a603 btrfs: fix processing of delayed data refs during backref walking c63a8cce r8152: add PID for the Lenovo OneLink+ Dock 06035fd1 arm64: errata: Remove AES hwcap for COMPAT tasks 62ab3d75 KVM: arm64: vgic: Fix exit condition in scan_its_table() da2ea4a9 ata: ahci: Match EM_MAX_SLOTS with SATA_PMP_MAX_PORTS 5e7bff83 ata: ahci-imx: Fix MODULE_ALIAS 12a634b6 x86/microcode/AMD: Apply the patch early on every logical thread 853317a5 ocfs2: fix BUG when iput after ocfs2_mknod fails 0f6097b6 ocfs2: clear dinode links count in case of error 90e264ad Merge 4.14.297 into android-4.14-stable a85772d7 Linux 4.14.297 7a4d2cba x86/speculation: Add RSB VM Exit protections 47e5ac73 x86/bugs: Warn when "ibrs" mitigation is selected on Enhanced IBRS parts f3902227 x86/speculation: Use DECLARE_PER_CPU for x86_spec_ctrl_current 738b239a x86/speculation: Disable RRSBA behavior 93c878b2 x86/bugs: Add Cannon lake to RETBleed affected CPU list 2ec38cb7 x86/cpu/amd: Enumerate BTC_NO 03252549 x86/common: Stamp out the stepping madness 3d323b99 x86/speculation: Fill RSB on vmexit for IBRS 64745785 KVM: VMX: Fix IBRS handling after vmexit ace9857c KVM: VMX: Prevent guest RSB poisoning attacks with eIBRS 3e3402bc x86/speculation: Remove x86_spec_ctrl_mask 5cbe1ba4 x86/speculation: Use cached host SPEC_CTRL value for guest entry/exit 80d85603 x86/speculation: Fix SPEC_CTRL write on SMT state change 9356fb0d x86/speculation: Fix firmware entry SPEC_CTRL handling c34ffb2a x86/speculation: Fix RSB filling with CONFIG_RETPOLINE=n 48bfe6ca x86/speculation: Add LFENCE to RSB fill sequence c95afe5b x86/speculation: Change FILL_RETURN_BUFFER to work with objtool 893b2aa0 entel_idle: Disable IBRS during long idle 4b9a6e97 x86/bugs: Report Intel retbleed vulnerability 40e02f3a x86/bugs: Split spectre_v2_select_mitigation() and spectre_v2_user_select_mitigation() b57fd0a7 x86/speculation: Add spectre_v2=ibrs option to support Kernel IBRS d9dff84d x86/bugs: Optimize SPEC_CTRL MSR writes 6a0fee43 x86/entry: Add kernel IBRS implementation 3d18a2dd x86/bugs: Keep a per-CPU IA32_SPEC_CTRL value 1bd2d85a x86/bugs: Add AMD retbleed= boot parameter f8fcd872 x86/bugs: Report AMD retbleed vulnerability 37b4aee1 x86/cpufeatures: Move RETPOLINE flags to word 11 2d939788 x86/entry: Remove skip_r11rcx 01ffba9e x86/cpu: Add a steppings field to struct x86_cpu_id c4fc5dae x86/cpu: Add consistent CPU match macros 4b18dc82 x86/devicetable: Move x86 specific macro out of generic code fe33a42c x86/cpufeature: Fix various quality problems in the <asm/cpu_device_hd.h> header 9b7a673e x86/cpufeature: Add facility to check for min microcode revisions 6fde716d Revert "x86/cpu: Add a steppings field to struct x86_cpu_id" c8ea89af Merge 4.14.296 into android-4.14-stable 41f36d78 Linux 4.14.296 a9b9075b thermal: intel_powerclamp: Use first online CPU as control_cpu 92e6e36e inet: fully convert sk->sk_rx_dst to RCU rules cb28469d efi: libstub: drop pointless get_memory_map() call 3b0a2bd5 md: Replace snprintf with scnprintf 8ad00285 ext4: continue to expand file system when the target size doesn't reach 74914b8f net/ieee802154: don't warn zero-sized raw_sendmsg() 791a7493 net: ieee802154: return -EINVAL for unknown addr type 5a9059ba perf intel-pt: Fix segfault in intel_pt_print_info() with uClibc 7dad4203 usb: idmouse: fix an uninit-value in idmouse_open 125cc2e3 Revert "usb: storage: Add quirk for Samsung Fit flash" a1008c8b usb: musb: Fix musb_gadget.c rxstate overflow bug e702de2f usb: host: xhci: Fix potential memory leak in xhci_alloc_stream_info() 7d808fe6 md/raid5: Wait for MD_SB_CHANGE_PENDING in raid5d fb8b43b7 HID: roccat: Fix use-after-free in roccat_read() 3ba3846c nbd: Fix hung when signal interrupts nbd_start_device_ioctl() 1811fea3 scsi: 3w-9xxx: Avoid disabling device if failing to enable it 10c99d1c media: cx88: Fix a null-ptr-deref bug in buffer_prepare() de643470 ARM: dts: imx6sl: add missing properties for sram fbf721aa ARM: dts: imx6qp: add missing properties for sram 8cc7fe3a ARM: dts: imx6dl: add missing properties for sram 86d4d053 ARM: dts: imx6q: add missing properties for sram 3c3ff91f ARM: dts: imx7d-sdb: config the max pressure for tsc2046 5547d093 drm/amdgpu: fix initial connector audio value 6ea585bf platform/x86: msi-laptop: Change DMI match / alias strings to fix module autoloading a73b4018 drm/vc4: vec: Fix timings for VEC modes ee9885cd drm: Prevent drm_copy_field() to attempt copying a NULL pointer 5b5ba7d6 drm: Use size_t type for len variable in drm_copy_field() f5d6c938 r8152: Rate limit overflow messages 843fc4e3 Bluetooth: L2CAP: Fix user-after-free 1f48ab20 net: If sock is dead don't access sock's sk_wq in sk_stream_wait_memory 9690cea2 wifi: rt2x00: correctly set BBP register 86 for MT7620 fb4d18ed wifi: rt2x00: set SoC wmac clock register f1758805 wifi: rt2x00: set correct TX_SW_CFG1 MAC register for MT7620 87287c5a wifi: rt2x00: don't run Rt5592 IQ calibration on MT7620 9baf1000 can: bcm: check the result of can_send() in bcm_can_tx() 61444237 Bluetooth: hci_sysfs: Fix attempting to call device_add multiple times 324dd121 Bluetooth: L2CAP: initialize delayed works at l2cap_chan_create() 1613a7b2 wifi: brcmfmac: fix use-after-free bug in brcmf_netdev_start_xmit() a39f456d xfrm: Update ipcomp_scratches with NULL when freed f3d2a3b7 wifi: ath9k: avoid uninit memory read in ath9k_htc_rx_msg() 9bbc61e6 tcp: annotate data-race around tcp_md5sig_pool_populated 684c3694 openvswitch: Fix overreporting of drops in dropwatch 8a1a8ed0 openvswitch: Fix double reporting of drops in dropwatch 7ccb0529 wifi: brcmfmac: fix invalid address access when enabling SCAN log level 38abf4a3 NFSD: Return nfserr_serverfault if splice_ok but buf->pages have data 0f91f66c thermal: intel_powerclamp: Use get_cpu() instead of smp_processor_id() to avoid crash 3eb0ba70 powercap: intel_rapl: fix UBSAN shift-out-of-bounds issue d6ab85b2 MIPS: BCM47XX: Cast memcmp() of function to (void *) 884a556a ACPI: video: Add Toshiba Satellite/Portege Z830 quirk 2c7772b3 f2fs: fix race condition on setting FI_NO_EXTENT flag c4d4c2af crypto: cavium - prevent integer overflow loading firmware a37f21db iommu/iova: Fix module config properly ec53b99b iommu/omap: Fix buffer overflow in debugfs 37d9e87e powerpc: Fix SPE Power ISA properties for e500v1 platforms 8f2f5a5e powerpc/powernv: add missing of_node_put() in opal_export_attrs() 5d98d732 powerpc/pci_dn: Add missing of_node_put() 8b268956 powerpc/sysdev/fsl_msi: Add missing of_node_put() 215d662a powerpc/math_emu/efp: Include module.h 2827127c mailbox: bcm-ferxrm-mailbox: Fix error check for dma_map_sg d84f77ef clk: ti: dra7-atl: Fix reference leak in of_dra7_atl_clk_probe 56479bc4 clk: bcm2835: fix bcm2835_clock_rate_from_divisor declaration fc0ce271 spmi: pmic-arb: correct duplicate APID to PPID mapping logic 16ef9963 dmaengine: ioat: stop mod_timer from resurrecting deleted timer in __cleanup() c1da5798 mfd: sm501: Add check for platform_driver_register() 04656224 mfd: lp8788: Fix an error handling path in lp8788_irq_init() and lp8788_irq_init() 2a226003 mfd: lp8788: Fix an error handling path in lp8788_probe() fdf97de9 mfd: fsl-imx25: Fix an error handling path in mx25_tsadc_setup_irq() 42d95f92 mfd: intel_soc_pmic: Fix an error handling path in intel_soc_pmic_i2c_probe() 25a0b870 fsi: core: Check error number after calling ida_simple_get 84b741be serial: 8250: Fix restoring termios speed after suspend 45145476 firmware: google: Test spinlock on panic path to avoid lockups 8c7c4fd8 phy: qualcomm: call clk_disable_unprepare in the error handling 3bf05c26 drivers: serial: jsm: fix some leaks in probe 26a5fe8a usb: gadget: function: fix dangling pnp_string in f_printer.c db730385 xhci: Don't show warning for reinit on known broken suspend 54c30c9f md/raid5: Ensure stripe_fill happens on non-read IO with journal d7d67c4d ata: fix ata_id_has_dipm() ea6cb925 ata: fix ata_id_has_ncq_autosense() ab0d1482 ata: fix ata_id_has_devslp() 887d0217 ata: fix ata_id_sense_reporting_enabled() and ata_id_has_sense_reporting() 5ab88055 dyndbg: let query-modname override actual module name 48c50d6d dyndbg: fix module.dyndbg handling 00771981 RDMA/rxe: Fix the error caused by qp->sk eca11969 RDMA/rxe: Fix "kernel NULL pointer dereference" error 6e7b3b1e media: xilinx: vipp: Fix refcount leak in xvip_graph_dma_init a177efe2 tty: xilinx_uartps: Fix the ignore_status 0ab05d59 media: exynos4-is: fimc-is: Add of_node_put() when breaking out of loop bae06dc4 HSI: omap_ssi_port: Fix dma_map_sg error check 18e199a5 HSI: omap_ssi: Fix refcount leak in ssi_probe 6f76ef65 clk: tegra20: Fix refcount leak in tegra20_clock_init ce699dcd clk: tegra: Fix refcount leak in tegra114_clock_init e715510a clk: tegra: Fix refcount leak in tegra210_clock_init 757de346 clk: oxnas: Hold reference returned by of_get_parent() ce338bc9 iio: ABI: Fix wrong format of differential capacitance channel ABI. ee5475ba iio: inkern: only release the device node when done with it a198f9ff iio: adc: at91-sama5d2_adc: fix AT91_SAMA5D2_MR_TRACKTIM_MAX b262286e ARM: dts: exynos: fix polarity of VBUS GPIO of Origen b1d601f3 ARM: Drop CMDLINE_* dependency on ATAGS a41cc0cf ARM: dts: kirkwood: lsxl: remove first ethernet port 3f1983f6 ARM: dts: kirkwood: lsxl: fix serial line 537b1ab6 ARM: dts: turris-omnia: Fix mpp26 pin name and comment 7be77ae4 soc: qcom: smem_state: Add refcounting for the 'state->of_node' bd4666bf soc: qcom: smsm: Fix refcount leak bugs in qcom_smsm_probe() a4f7eb83 memory: of: Fix refcount leak bug in of_get_ddr_timings() 086f71f7 mmc: wmt-sdmmc: Fix an error handling path in wmt_mci_probe() 831a7b50 ALSA: dmaengine: increment buffer pointer atomically 32537992 ASoC: eureka-tlv320: Hold reference returned from of_find_xxx API 04f8dc65 mmc: au1xmmc: Fix an error handling path in au1xmmc_probe() aaa512ad drm/bridge: megachips: Fix a null pointer dereference bug 06afe912 platform/x86: msi-laptop: Fix resource cleanup ee0ea7cc platform/x86: msi-laptop: Fix old-ec check for backlight registering 26236457 drm/mipi-dsi: Detach devices when removing the host f63e896e bnx2x: fix potential memory leak in bnx2x_tpa_stop() 2425007c net: rds: don't hold sock lock when cancelling work from rds_tcp_reset_callbacks() e40b1941 tcp: fix tcp_cwnd_validate() to not forget is_cwnd_limited cbd34237 mISDN: fix use-after-free bugs in l1oip timer handlers 0d720c3f vhost/vsock: Use kvmalloc/kvfree for larger packets. 12547ecb spi: s3c64xx: Fix large transfers with DMA 0fbbe6ac netfilter: nft_fib: Fix for rpath check with VRF devices a0f8a017 spi/omap100k:Fix PM disable depth imbalance in omap1_spi100k_probe 15c02201 net: fs_enet: Fix wrong check in do_pd_setup 4f681b41 wifi: rtl8xxxu: gen2: Fix mistake in path B IQ calibration d97f6f51 wifi: rtl8xxxu: Fix skb misuse in TX queue selection 9a863b7e spi: qup: add missing clk_disable_unprepare on error in spi_qup_pm_resume_runtime() 9ed1b725 spi: qup: add missing clk_disable_unprepare on error in spi_qup_resume() 8d726280 wifi: rtl8xxxu: tighten bounds checking in rtl8xxxu_read_efuse() be1e4031 wifi: mac80211: allow bw change during channel switch in mesh 2d625971 wifi: ath10k: add peer map clean up for peer delete in ath10k_sta_state() dad2352c sh: machvec: Use char[] for section boundaries 0c909c2f selinux: use "grep -E" instead of "egrep" Bug: 235113793 Bug: 235114355 Bug: 245402502 Bug: 245928838 Bug: 256876017 Bug: 260299968 Bug: 263916797 Bug: 265546875 Pick-Prebuilt: 507271803 Build-Id: 9563959 Processing-Config: kernel_headers Change-Id: Ie982be42e1ab209e0ef1235aafda327f8c2c71d1 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-01-17Merge cherrypicks of ['ag/20979006'] into tm-qpr2-release.android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s1-releaseAndroid Build Coastguard Worker
Change-Id: Ia93e7d56249ce54f44a7e2ed124a06d0f0c7b6c3
2023-01-17sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ]evahuang
Linux version 4.14.295-g3547aebef7e0-ab9438649 (android- build@abfarm-2004-0513) (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 Tue Dec 27 07:28:00 UTC 2022 private/msm-google: (6 changes) 3547aebe Merge android-msm-pixel-4.14-tm-qpr1 into android-msm-pixel-4.14-tm-qpr2 776e1655 Merge branch 'android-msm-pixel-4.14-tm-security' into android-msm-pixel-4.14-tm-qpr1 3bea31c2 video: fbdev: pxa3xx-gcu: Fix integer overflow in pxa3xx_gcu_write d4bf190c msm: ADSPRPC: Restrict untrusted applications from attaching to GuestOS 67306c57 msm: camera: eeprom: Add OOB read check for eeprom memory map d393f881 msm: camera: memmgr: update correct length in bufq Bug: 235113793 Bug: 235114355 Bug: 245402502 Bug: 245928838 Bug: 256876017 Bug: 245793128 Pick-Prebuilt: 501770934 Build-Id: 9438649 Processing-Config: kernel_headers Change-Id: I62dc150de3e73c3098d0671730a62db95e8d800c Signed-off-by: evahuang <evahuang@google.com> (cherry picked from commit c289a8fb0fad78d434942109c8349d8950768c52) Merged-In: I62dc150de3e73c3098d0671730a62db95e8d800c
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136Xin Li
Bug: 264720040 Merged-In: I00464d15fda26ff7bbd8506d60bf284d714c0fb3 Change-Id: Ibc3f8fa2c16c680e06ec77291ada62ce303bf093
2023-01-04Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGEBill Yi
Merged-In: I91f98760f0ed7ba067ae32d3ea13c20b04c36f65 Change-Id: Id52362568105741b718f5096d80fe32c6d77de44