summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-09-21Snap for 10843824 from 49cdfc22db6be7a55ae951e522d5ecadf6293a90 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: I798f304352c9d8056bba21e31156cd94a5bb1edc
2023-08-26Update kernel to builds 10710438 am: 597e8872a3 am: f873c5d3d9 am: ↵HEADmastermainPrashanth Swaminathan
69ed05ac06 am: cca228517e am: 04f898e666 Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2727059 Change-Id: I6ed47287b403dac87dd834d48f91bd22eaf8a715 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-26Update kernel to builds 10710438 am: 597e8872a3 am: f873c5d3d9 am: ↵Prashanth Swaminathan
69ed05ac06 am: cca228517e Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2727059 Change-Id: I602953c960d20d05405f7c0472d9543f0d2b1c18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-26Update kernel to builds 10710438 am: 597e8872a3 am: f873c5d3d9 am: 69ed05ac06Prashanth Swaminathan
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2727059 Change-Id: Ice0510a7e9d89af31a1a89d68996437d7f4c0e01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-26Update kernel to builds 10710438 am: 597e8872a3 am: f873c5d3d9Prashanth Swaminathan
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2727059 Change-Id: Ie901a628d4cc16cfdb739b7c716a95f878af275a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-26Update kernel to builds 10710438 am: 597e8872a3Prashanth Swaminathan
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2727059 Change-Id: Iae5f8a36032b413e5e487a6de35504faf5ba8257 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25Update kernel to builds 10710438Prashanth Swaminathan
git log --first-parent -100 --oneline --no-decorate bbe44ba33044..bbe44ba33044: Test: treehugger Bug: 295058495 Change-Id: If70658b09221cdff39409b6253a99e26a3798f55
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 8573361f15 -s ↵Xin Li
ours am: f7849b69f3 -s ours am: 31d4487e23 -s ours am: 080bd179a1 -s ours am skip reason: Merged-In I2b4229e7bea9084ebb0d90a5517bb330d16f58f2 with SHA-1 116d42f8e3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/24087542 Change-Id: I7977741dc2fcc19cddc88a1000e143a713ac7bb6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 8573361f15 -s ↵Xin Li
ours am: f7849b69f3 -s ours am: 31d4487e23 -s ours am skip reason: Merged-In I2b4229e7bea9084ebb0d90a5517bb330d16f58f2 with SHA-1 116d42f8e3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/24087542 Change-Id: I17927b2e4d5cc0301c485ca769f0d5ac370cb0ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 8573361f15 -s ↵Xin Li
ours am: f7849b69f3 -s ours am skip reason: Merged-In I2b4229e7bea9084ebb0d90a5517bb330d16f58f2 with SHA-1 116d42f8e3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/24087542 Change-Id: I7bfa8287f0e8d96ef50ca799a50f48444be552ef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 8573361f15 -s oursXin Li
am skip reason: Merged-In I2b4229e7bea9084ebb0d90a5517bb330d16f58f2 with SHA-1 116d42f8e3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/24087542 Change-Id: I950c4b39759a854a793de825f8943b07a59c9446 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14Empty Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: I2b4229e7bea9084ebb0d90a5517bb330d16f58f2 Change-Id: I15da2ba09ec4426858c3c1635e324406ce7f4162
2023-06-29Merge "Update kernel to builds 10303652" am: 0feea8278f am: 9121446a09 am: ↵Treehugger Robot
05a2c4fba2 am: 477f1516f7 am: a469d31d70 am: 9384586ff4 Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2622497 Change-Id: I33f5651321d7577cdd62e98fe92215ca752497be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29Merge "Update kernel to builds 10303652" am: 0feea8278f am: 9121446a09 am: ↵Treehugger Robot
05a2c4fba2 am: 477f1516f7 am: a469d31d70 Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2622497 Change-Id: I6655fee69a805c4770b3afb1203f9f0a1abf46a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29Merge "Update kernel to builds 10303652" am: 0feea8278f am: 9121446a09 am: ↵Treehugger Robot
05a2c4fba2 am: 477f1516f7 Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2622497 Change-Id: I69ade17cf14068dc7d23952aeda0cdc3aaebfc80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28Merge "Update kernel to builds 10303652" am: 0feea8278f am: 9121446a09 am: ↵Treehugger Robot
05a2c4fba2 Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2622497 Change-Id: Ida751019d0c69c329fc01d29f3e51578ede2705d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28Merge "Update kernel to builds 10303652" am: 0feea8278f am: 9121446a09Treehugger Robot
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2622497 Change-Id: I609b55e06ce5d185f5e70354e649109ecc31973b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28Merge "Update kernel to builds 10303652" am: 0feea8278fTreehugger Robot
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2622497 Change-Id: I78c9c58eba84999401a544b25664a713b24d5a15 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28Merge "Update kernel to builds 10303652"Treehugger Robot
2023-06-12Update kernel to builds 10303652Alistair Delva
git log --first-parent -100 --oneline --no-decorate 71c54981e509..0526833d4674: 0526833d4674 ANDROID: set CONFIG_IKHEADERS=m for gki_defconfig. a0695ef8984c ANDROID: RISC-V: Support 32_PCREL relocation type in kernel module b0acbba3f489 Revert "Revert "Revert "FROMLIST: kheaders: Follow symlinks to source files.""" 81ce9a434387 Revert "Revert "FROMLIST: kheaders: Follow symlinks to source files."" dd1740e7420f ANDROID: gki_defconfig: enable CONFIG_LED_TRIGGER_PHY 18055715b2e9 Merge 91ec4b0d11fe ("Merge tag 'mips_6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux") into android-mainline 1116c8fd4e78 ANDROID: debug_kinfo: fix build issues due to module memory logic change bc39b3922b53 Merge b6a7828502dc ("Merge tag 'modules-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux") into android-mainline f6bfcb34b30c Revert "ANDROID: module: Add vendor hooks" 3ec98b81b191 UPSTREAM: cdx: fix build failure due to sysfs 'bus_type' argument needing to be const 03beeec52af4 Merge cec24b8b6bb8 ("Merge tag 'char-misc-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") into android-mainline cdd23c753171 ANDROID: usb: gadget: configfs: follow class_create() API change 0e6a2fe7138f Merge 556eb8b79190 ("Merge tag 'driver-core-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core") into android-mainline e43c2266f3b2 Merge 97b2ff294381 ("Merge tag 'staging-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging") into android-mainline 7e0806eae138 ANDROID: dm-default-key: update for blk_crypto_evict_key() API change f3170cbba601 ANDROID: update PCI dwc vendor entries sort order in gki_defconfig e5638d1c2443 Merge "Merge b02847fc2e7a ("Merge tag 'firewire-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394") into android-mainline" into android-mainline c9440d6849be Merge "Merge b68ee1c6131c ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") into android-mainline" into android-mainline c0bb6216f7f2 Merge "Merge 0cfd8703e7da ("Merge tag 'pm-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline" into android-mainline 42f0514a17ed Merge "Merge df45da57cbd3 ("Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux") into android-mainline" into android-mainline 3f6711f547cf ANDROID: power: wakeup_reason: change abort log 311db2be5ed4 ANDROID: GKI: Enable CONFIG_MODULE_SCMVERSION=y 1bf5e5e70d85 ANDROID: modules: re-introduce the MODULE_SCMVERSION config 3ee567fc882c Revert "FROMLIST: kheaders: Follow symlinks to source files." 988af76d5251 FROMLIST: kheaders: Follow symlinks to source files. 2a4fc73f7eb9 Merge 53b5e72b9d89 ("Merge tag 'asm-generic-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic") into android-mainline 93c19faf38ce Merge 18032df5ef5c ("Merge tag 'soc-arm-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc") into android-mainline 5353cbb84fd8 Merge "Merge de10553fce40 ("Merge tag 'x86-apic-2023-04-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline" into android-mainline 1a5787e547f7 ANDROID: Disable BTI_KERNEL, enable UNWIND_PATCH_PAC_INTO_SCS bbf887fdf309 ANDROID: revert scripts/setlocalversion to track upstream. 1ef87dde39f5 Merge 3f614ab563c4 ("Merge tag 'irq-core-2023-04-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline bb4046cc73ea Merge bc1bb2a49bae ("Merge tag 'x86_sev_for_v6.4_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline 64fd482e1aad Merge f7301270a29f ("Merge tag 'm68k-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k") into android-mainline 969afefd014a Merge "Merge 3323ddce085c ("Merge tag 'v6.4/kernel.user_worker' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux") into android-mainline" into android-mainline b3f95a3232a6 Merge "Merge c23f28975abc ("Merge tag 'docs-6.4' of git://git.lwn.net/linux") into android-mainline" into android-mainline d3c9538cbbc5 ANDROID: fix up android selinux build break. b16d4db4d7e2 Merge "Merge 72eaa0967b59 ("Merge tag 'selinux-pr-20230420' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux") into android-mainline" into android-mainline 91e9354a2b0f ANDROID: clang: update to 17.0.2 d3ff606b9b42 ANDROID: db845c: Remove MAKE_GOALS from build.config 4ea7f8e5290e Merge a5624566431d ("Merge branch 'x86-rep-insns': x86 user copy clarifications") into android-mainline 6b893a535cfa ANDROID: GKI: gen_gki_modules_headers update preprocessing dad4133ce566 ANDROID: kleaf: move NDK_TRIPLE for arm to build.config.constants. ab7e63ef765d ANDROID: GKI: Remove MAKE_GOALS from build.config 3669a3205af3 Revert "ANDROID: uid_sys_stat: split the global lock uid_lock to the fine-grained" 52ace503ecf8 Revert "mm/mmap: regression fix for unmapped_area{_topdown}" 696875cf6ccb UPSTREAM: mm/mremap: fix vm_pgoff in vma_merge() case 3 c0982b96e545 UPSTREAM: mm/mremap: fix dup_anon_vma() in vma_merge() case 4 534aabfc7065 Revert "ANDROID: Revert "vma_merge: set vma iterator to correct position."" 2c29f21d588c Revert "ANDROID: Revert "mm/mmap: remove __vma_adjust()"" d6f122ec7fee Revert "ANDROID: Revert "mm/mmap: introduce dup_vma_anon() helper"" 678d35d48482 Merge "Merge tag 'v6.3' into android-mainline" into android-mainline 4979a7d6da1e Merge "Merge tag 'v6.3-rc7' into android-mainline" into android-mainline 3bb94cb8b50b Merge "Merge tag 'v6.3-rc6' into android-mainline" into android-mainline 7315a9e9dc11 Merge "Merge tag 'v6.3-rc5' into android-mainline" into android-mainline 86b8628f2c75 Merge "Merge tag 'v6.3-rc4' into android-mainline" into android-mainline b66a75f0102b Merge changes I7f66dc29,If047c963,Ieab3c28d,Idbbb055e,I50f02160, ... into android-mainline ee1f5fc55cc7 FROMGIT: Input: uinput - allow injecting event times 60e977466b46 Merge "Merge tag 'v6.3-rc1' into android-mainline" into android-mainline b3bbca0dc752 ANDROID: GKI: Clean up: Remove protectred lists b18b7c401af5 ANDROID: GKI: Increase max 8250 uarts ccc4fb8185b5 ANDROID: Unnest MAKE_GOALS from build configs 8d1181e1aae7 Merge changes I57e27303,I58ef0565 into android-mainline 8a690bb73d31 ANDROID: GKI: Convert USB network adpaters to modules 10094d2eb366 ANDROID: GKI: Multi arch exports protection support be0b0e7e080a Merge changes I5a1f065f,I808d01f8,Iea061f0d,I13f02ba3 into android-mainline 446edffc5a03 Merge "Merge 5a6d92493bb2 ("Merge tag 'memblock-v6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock") into android-mainline" into android-mainline 8235c131c99d Merge "Merge b6cc7a043690 ("Merge tag 'csky-for-linus-6.3' of https://github.com/c-sky/csky-linux") into android-mainline" into android-mainline b0bdce574310 Merge "Merge 498a1cf902c3 ("Merge tag 'kbuild-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild") into android-mainline" into android-mainline fbb2a6ba9afb Merge "Merge 6ab7e1f95e96 ("setlocalversion: use only the correct release tag for git-describe") into android-mainline" into android-mainline c859c64bec68 Merge "Merge eed36d775177 ("setlocalversion: clean up the construction of version output") into android-mainline" into android-mainline 4e20e6ae4708 Merge "Merge 534066a983df (".gitignore: ignore *.cover and *.mbx") into android-mainline" into android-mainline 489270b9b23b Merge "Merge 1cb86b6c3136 ("kbuild: save overridden KERNELRELEASE in include/config/kernel.release") into android-mainline" into android-mainline 47565e6bc6a0 Merge "Merge ec31f868ec67 ("setlocalversion: absorb $(KERNELVERSION)") into android-mainline" into android-mainline 8fcaab935644 ANDROID: uid_sys_stat: split the global lock uid_lock to the fine-grained locks for each hlist in hash_table. 2f021aeb7b98 Merge 75280bdf49b2 ("setlocalversion: make indentation shallower") into android-mainline 12fc0c99248f Merge 992ebfab2a75 ("setlocalversion: simplify the construction of the short version") into android-mainline 04b0e56de8b4 Merge f6e09b07cc12 ("kbuild: do not put .scmversion into the source tarball") into android-mainline 0cf2f183d9b1 Merge c9f9cf2560e4 ("builddeb: clean generated package content") into android-mainline 199a06ed36b9 Merge db1547c56886 ("kbuild: Turn a couple more of clang's unused option warnings into errors") into android-mainline 171ace325c6c Revert "ANDROID: cpufreq: Add a restricted vendor hook for freq transition" 8e5a624b36ba Revert "ANDROID: kernel: Add restricted vendor hook in creds" d5be25264187 Merge "Merge 2f0e2a39bbab ("docs/kbuild/makefiles: unify quoting") into android-mainline" into android-mainline 4abccb21aebd Merge c83b16cefd78 ("kbuild: rust: move rust/target.json to scripts/") into android-mainline 5c05cafa8df7 Merge bc6df812a152 ("fixdep: parse Makefile more correctly to handle comments etc.") into android-mainline e7c6f62d6e6c Merge b8a9ddcafc1a (".gitignore: update the command to check tracked files being ignored") into android-mainline adf7c9a80241 Merge 4b8c673b761e ("Merge tag 'media/v6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media") into android-mainline 640f620093b7 Merge 1ec35eadc3b4 ("Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux") into android-mainline 17112c544865 Merge 60e2bf7d10e9 ("Merge tag 'input-for-v6.3-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input") into android-mainline d645c62fd19a Merge 84cc6674b76b ("Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost") into android-mainline 79bd0b00a3df Merge 01687e7c935e ("Merge tag 'riscv-for-linus-6.3-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux") into android-mainline 4d2ea3e683d4 Merge d0a32f5520a3 ("Merge tag 'powerpc-6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux") into android-mainline 71259ab47732 Merge 143c7bc6496c ("Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd") into android-mainline d0cbb8cc8d3d Merge a13de74e4765 ("Merge tag 'iommu-updates-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu") into android-mainline f1b89ba8fd09 Merge 8395d932d24a ("Merge tag 'devicetree-for-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux") into android-mainline 78c613636f74 Merge a93e884edf61 ("Merge tag 'driver-core-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core") into android-mainline a152035c8d1d Merge "Merge 693fed981eb9 ("Merge tag 'char-misc-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") into android-mainline" into android-mainline f732b5234076 Merge "Merge 72bffe7e1eb6 ("Merge tag 'usb-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb") into android-mainline" into android-mainline 4a51b53e719f ANDROID: remove CONFIG_DEBUG_PREEMPT from arm64 gki_defconfig a6ef8539c181 ANDROID: GKI: Enable CONFIG_USB_CONFIGFS_F_UAC2 0cb2354cb3a2 Merge "Merge d2980d8d8265 ("Merge tag 'mm-nonmm-stable-2023-02-20-15-29' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm") into android-mainline" into android-mainline Test: treehugger Bug: 286415667 Change-Id: I04e8cd210b6af6b5b9f0cb0c38a422612a4b658d
2023-05-16Add 16K kernel artifacts from build 10072136 am: b0d770087d am: e928ab1b66 ↵Kelvin Zhang
am: 8f0dec2aaa am: 116d42f8e3 am: c0583158ee am: 68d8419911 Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2584442 Change-Id: Iebe8dce51651933a0914b1ac80a9361412a69106 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16Add 16K kernel artifacts from build 10072136 am: b0d770087d am: e928ab1b66 ↵Kelvin Zhang
am: 8f0dec2aaa am: 116d42f8e3 am: c0583158ee Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2584442 Change-Id: If72fb272e3ce0f32df4e76a1eeab9696f6b67077 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16Add 16K kernel artifacts from build 10072136 am: b0d770087d am: e928ab1b66 ↵Kelvin Zhang
am: 8f0dec2aaa am: 116d42f8e3 Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2584442 Change-Id: I82105b656d60db5efc669688d08214a9242a6c92 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16Add 16K kernel artifacts from build 10072136 am: b0d770087d am: e928ab1b66 ↵Kelvin Zhang
am: 8f0dec2aaa Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2584442 Change-Id: I2b4229e7bea9084ebb0d90a5517bb330d16f58f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16Add 16K kernel artifacts from build 10072136 am: b0d770087d am: e928ab1b66Kelvin Zhang
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2584442 Change-Id: I8a7974a29de109961e78c591197ff78e740d1f25 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16Add 16K kernel artifacts from build 10072136 am: b0d770087dKelvin Zhang
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2584442 Change-Id: I497f359a9ec4465f4857efdf23f11f64a015cf2b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11Add 16K kernel artifacts from build 10072136Kelvin Zhang
Test: th Bug: 279808236 Change-Id: Id1493f8732f830d9ecbb463887c2a2ca7b712eb2
2023-03-23Update kernel to builds 9783969 am: e163364e4b am: 7abe7c7caf am: 4d1e8d775e ↵Prashanth Swaminathan
am: 2c6ea52894 am: c9d26e0aa0 Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2500662 Change-Id: I8345004dffdaf7f94a91a37e7727c99c5beaa06b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Update kernel to builds 9680313 am: 35e7c2d974 am: bee67d69c9 am: 001baa579e ↵Alistair Delva
am: 76078757f5 am: 96bbdd3a41 Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2500382 Change-Id: Ia50efc5fab0f10d2fc5789a7c5fce9efa5c0b101 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Update kernel to builds 9783969 am: e163364e4b am: 7abe7c7caf am: 4d1e8d775e ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releasePrashanth Swaminathan
am: 2c6ea52894 Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2500662 Change-Id: Ic9c625f95223465cad695029ef63900b20c9c8e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Update kernel to builds 9680313 am: 35e7c2d974 am: bee67d69c9 am: 001baa579e ↵Alistair Delva
am: 76078757f5 Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2500382 Change-Id: I6553b9efdb8ac83bfcb6bcccdb66034841570d47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Update kernel to builds 9783969 am: e163364e4b am: 7abe7c7caf am: 4d1e8d775eandroid14-devPrashanth Swaminathan
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2500662 Change-Id: Icbab169d6933214f0760d01d22ddf810727b0eb8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Update kernel to builds 9680313 am: 35e7c2d974 am: bee67d69c9 am: 001baa579eAlistair Delva
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2500382 Change-Id: Iade4d5d3a869521bdd793ab3d2208166a822f733 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Update kernel to builds 9783969 am: e163364e4b am: 7abe7c7cafPrashanth Swaminathan
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2500662 Change-Id: I9d3803ec75156b6bd119bae52e190a1700d90d84 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Update kernel to builds 9680313 am: 35e7c2d974 am: bee67d69c9Alistair Delva
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2500382 Change-Id: I74a274b265eda7e57b4b66426297b5545490dfdc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Update kernel to builds 9783969 am: e163364e4bPrashanth Swaminathan
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2500662 Change-Id: I1853cd5395997fdfba3e5c5059726c58c192b010 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Update kernel to builds 9680313 am: 35e7c2d974Alistair Delva
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/2500382 Change-Id: I8b0922c630184b1de1f3ea5d2b7c00fb153f6a6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21Update kernel to builds 9783969android-u-beta-1-gplPrashanth Swaminathan
git log --first-parent -100 --oneline --no-decorate 141b3c5aa718..71c54981e509: 71c54981e509 ANDROID: Enable CONFIG_SMP for riscv configurations 14d5cd06da48 Merge 13e574b4941e ("Merge tag 'spi-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi") into android-mainline 3fbf22de8189 ANDROID: Drop CONFIG_LOCALVERSION/KMI_GENERATION from gki_defconfig. a92bfa8b9e3d ANDROID: Disable AF_RXRPC for allmodconfig. ce24789235ba ANDROID: remove CONFIG_NET_CLS_TCINDEX from gki_defconfig 05cc7b7d984b Merge "Merge 5b7c4cabbb65 ("Merge tag 'net-next-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") into android-mainline" into android-mainline a32cec8e3f22 ANDROID: Revert "cpuidle, dt: Push RCU-idle into driver" 8338670fd5bd Merge "Merge 36289a03bcd3 ("Merge tag 'v6.3-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6") into android-mainline" into android-mainline 882f50b889ac UPSTREAM: bpf: add missing header file include 7cbc74d8b008 Merge "Merge 877934769e5b ("Merge tag 'x86_cpu_for_v6.3_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline" into android-mainline 025c8009098c Merge "Merge 1b72607d7321 ("Merge tag 'thermal-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline" into android-mainline 29dd8c34b185 Merge "Merge 88af9b164c7a ("Merge tag 'acpi-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline" into android-mainline 210840632105 ANDROID: GKI: Enable MGLRU by default f1af1c747b4a Merge 560b80306782 ("Merge tag 'timers-core-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline 95f33b0c4ef3 Merge 89f5349e0673 ("Merge tag 'x86-platform-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline 500bc059e064 Merge 1f2d9ffc7a5f ("Merge tag 'sched-core-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline 5be62ba73aec ANDROID: Drop duplicate call to trace_sched_cpu_capacity_tp() a8d9faf6f6d1 Revert "ANDROID: sched/rt: Add support for rt sync wakeups" a7e7f106865c ANDROID: Revert "io_uring: use iter_ubuf for single range imports" 40eeb32ba014 ANDROID: Add joneslee to OWNERS_DrNo 2959dd0746af ANDROID: usb: gadget: f_accessory: update to usb_gstrings_attach 32ad953a348b ANDROID: Add joneslee to OWNERS a7a5cf9f192a Revert "ANDROID: Sched: Add vendor hooks required for WALT" d94fa9dcf5ba Revert "ANDROID: tracing: Add restricted vendor hooks for preemptirq events" 1a052a9ed082 Merge a2f0e7eee134 ("Merge tag 'perf-core-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline f6950e4e1ffa Merge db77b8502a40 ("Merge tag 'asm-generic-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic") into android-mainline e6c45b356ae8 ANDROID: GKI: remove CONFIG_BFQ_GROUP_IOSCHED from gki_defconfig c3d3b894f7d1 Merge 5b0ed5964928 ("Merge tag 'for-6.3/block-2023-02-16' of git://git.kernel.dk/linux") into android-mainline 278dc5dfe53f Merge 553637f73c31 ("Merge tag 'for-6.3/dio-2023-02-16' of git://git.kernel.dk/linux") into android-mainline Test: treehugger Bug: 274541879 Change-Id: I25af10eb754c06fb0c4bcc0b3fef9a261f42879e
2023-03-21Update kernel to builds 9680313Alistair Delva
git log --first-parent -100 --oneline --no-decorate bbe44ba33044..141b3c5aa718: 141b3c5aa718 Merge 6639c3ce7fd2 ("Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fsverity/linux") into android-mainline 1a4a842755d4 Merge f18f9845f2f1 ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux") into android-mainline 6ff35353920b Merge 91bc559d8d3a ("Merge tag 'fs.acl.v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping") into android-mainline 5958e9b19017 ANDROID: Incremental fs: fix up for vfs changes in 6.3-rc1 6010479be467 Merge 05e6295f7b5e ("Merge tag 'fs.idmapped.v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping") into android-mainline c8b92d22603f ANDROID: riscv64: Enable HAVE_EFFICIENT_UNALIGNED_ACCESS 50388ad4b44d ANDROID: riscv64: Temporarily disable KASAN 22a5c322e519 ANDROID: incremental fs: Move throttling to outside page lock 790cf8549f9d ANDROID: incremental fs: Fix race between truncate and write last block d7d399733aeb Merge de630176bdf8 ("Merge tag 'iversion-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux") into android-mainline 5532fa9feb81 ANDROID: INCFS: fix build error due to upstream changes 3a14f7ba976e Merge 575a7e0f812a ("Merge tag 'locks-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux") into android-mainline cfd95109b049 Merge 219ac97a486c ("Merge tag 'tpm-v6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd") into android-mainline f3df7a955f3b Merge tag 'v6.2' into android-mainline 947eaa83231b Merge 38f8ccde04a3 ("Merge tag 'mm-hotfixes-stable-2023-02-17-15-16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm") into android-mainline 7acc9d71d9d7 Merge ec35307e18ba ("Merge tag 'drm-fixes-2023-02-17' of git://anongit.freedesktop.org/drm/drm") into android-mainline fdc3e71c8c30 ANDROID: GKI: Fix copying of protected_exports 9f3f9a2634e0 ANDROID: GKI: Do not modify protected exports source list e9c2a5b84f01 Merge e1c04510f521 ("Merge tag 'pm-6.2-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline d1cb9d28e828 ANDROID: Move NDK_TRIPLE to build.config.constants. 07bca8509110 Merge "Merge 0983f6bf2bfc ("Merge tag 'devicetree-fixes-for-6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux") into android-mainline" into android-mainline bac25e12bba5 Merge tag 'v6.2-rc8' into android-mainline c9e98bfeeeae ANDROID: gki_defconfig: enable IPV6_MROUTE_MULTIPLE_TABLES 40a9a838b456 ANDROID: cpuidle-psci: Fix suspicious RCU usage fc0f1bd8ab63 Merge d2d11f342b17 ("Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs") into android-mainline 15518ecb7955 Merge tag 'v6.2-rc7' into android-mainline 00c6151125be Merge 837c07cf68fe ("Merge tag 'powerpc-6.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux") into android-mainline 838ca2e78d79 Merge 66a87fff1a87 ("Merge tag 'ata-6.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata") into android-mainline a2a0550225ce ANDROID: gic: Add affinity-setting vendor hooks to gic-v3 3dc71aaa72d7 ANDROID: gic: Add affinity-setting vendor hooks to gic 98911bd7951d ANDROID: GKI: Remove duplicates from symbol lists d9c13ea7126e Merge 9f266ccaa2f5 ("Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost") into android-mainline 7a69b9b69f9e Merge "Merge c0b67534c95c ("Merge tag 'cgroup-for-6.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup") into android-mainline" into android-mainline e709982a4ab9 ANDROID: GKI: Fix symbol list wildcard 83571e3b13db ANDROID: gki_defconfig: Enable RCU_BOOST config 94cc1bd5428a Merge tag 'v6.2-rc6' into android-mainline 97b7e0cb18db Merge tag 'v6.2-rc5' into android-mainline 370ab92ac2e1 Merge e67da28898e9 ("Merge tag 'usb-6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb") into android-mainline fd92d1ad25ce Merge 83cd5fd014c0 ("Merge tag 'kbuild-fixes-v6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild") into android-mainline 1c904c9a5441 Merge f883675bf652 ("Merge tag 'gpio-fixes-for-v6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux") into android-mainline 0ff5e989d74e ANDROID: BUILD.bazel: Add qcom soundwire module a46221b764d4 Merge tag 'v6.2-rc4' into android-mainline ff335fd889db Merge tag 'v6.2-rc3' into android-mainline 0866ec755df5 Merge tag 'v6.2-rc2' into android-mainline 92cf99250dd3 Merge tag 'v6.2-rc1' into android-mainline 03b368c24680 Merge 72a85e2b0a1e ("Merge tag 'spi-fix-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi") into android-mainline c79ce57c9be7 Merge be1236fce5f4 ("Merge tag 'for-netdev' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf") into android-mainline 0008366d36af Merge 06d65a6f6401 ("Merge tag 'mips_6.2_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux") into android-mainline 65bd9f8e9a20 Merge 9cf5b508bd26 ("Merge tag 'rproc-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux") into android-mainline 3de37795c55c Merge f2855eec19ca ("Merge tag 'mailbox-v6.2' of git://git.linaro.org/landing-teams/working/fujitsu/integration") into android-mainline bccfd47f32f9 ANDROID: kbuild: re-add .ko to external modules' modules.order 13aefad4af76 Merge "Merge 6feb57c2fd7c ("Merge tag 'kbuild-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild") into android-mainline" into android-mainline a3de1883d860 Revert "ANDROID: rproc: Add vendor hook for recovery" 3e6506b39902 Revert "ANDROID: rproc: Add vendor hook when setting recovery mode" 68e88a724028 ANDROID: GKI: defconfig: enable BTF debug info b5b98af51a63 ANDROID: kbuild: fix build for DEBUG_INFO_BTF_MODULES 78ac61086621 Merge "Merge 158738ea7505 ("Merge tag 'zstd-linus-v6.2' of https://github.com/terrelln/linux") into android-mainline" into android-mainline 65e0c24ac60c Merge "Merge 9322af3e6aea ("Merge tag 'dmaengine-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine") into android-mainline" into android-mainline 8aa896804315 Merge "Merge 1b6a349a40b9 ("Merge tag 'soundwire-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire") into android-mainline" into android-mainline 98e045c20fd2 Merge "Merge 03d84bd6d432 ("Merge tag 'msi-fixes-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms") into android-mainline" into android-mainline 0fcdc7563b0d Merge "Merge 75caf5940899 ("Merge tag 'leds-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds") into android-mainline" into android-mainline 516506034cb5 UPSTREAM: Fix mismerge due to devnode now taking a 'const *' device 871d19059f1a UPSTREAM: media: sun6i-isp: capture: Fix uninitialized variable use 15b8f79022d5 Merge 71a7507afbc3 ("Merge tag 'driver-core-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core") into android-mainline f00af9d68ed1 Merge fe36bb8736ee ("Merge tag 'trace-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace") into android-mainline 1a094aba37bd Revert "ANDROID: ftrace: vendor hook for ftrace dump on oops" 1a7874dd9b29 Merge "Merge 84e57d292203 ("Merge tag 'exfat-for-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat") into android-mainline" into android-mainline cdac582d82a2 Merge 9fa4abc9ad2a ("Merge tag 'fbdev-for-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev") into android-mainline 7ae649e7491b Merge 6f1f5caed5bf ("Merge tag 'for-linus-6.2-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux") into android-mainline c6fbf7f8ee9d Merge "Merge aa5ad10f6cca ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") into android-mainline" into android-mainline efd0ece1fb73 Merge "Merge 361c89a0da59 ("Merge tag 'pinctrl-v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl") into android-mainline" into android-mainline 7fb88b1c8375 ANDROID: gki_defconfig: disable various x86 and hw flags 1694e2760e48 Merge d0f3ad23cf4f ("Merge tag 'spi-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi") into android-mainline 68a00586559f Merge "Merge a594533df0f6 ("Merge tag 'drm-next-2022-12-13' of git://anongit.freedesktop.org/drm/drm") into android-mainline" into android-mainline 7b49f3dd1f49 ANDROID: GKI: Header generation fix and improvements 849ee75c5c9a ANDROID: usb: f_accessory: Check buffer size when initialised via composite 19f5ce3fcd69 Merge cdb9d3537711 ("Merge tag 'media/v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media") into android-mainline 77990cea68f9 Merge 102f9d3d4558 ("Merge tag 'sound-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound") into android-mainline f7fa49fd1d0c Merge 8715c6d3100f ("Merge tag 'for-6.2/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm") into android-mainline ea963e69f30f Merge 8ecd28b7a3a4 ("Merge tag 'ata-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata") into android-mainline 82c4e09b2e0a Merge ce8a79d5601a ("Merge tag 'for-6.2/block-2022-12-08' of git://git.kernel.dk/linux") into android-mainline ecd7f3d20306 Merge 96f7e448b9f4 ("Merge tag 'for-6.2/io_uring-next-2022-12-08' of git://git.kernel.dk/linux") into android-mainline 91b233e57070 Merge a45a7db9bc7b ("Merge tag 'vfs-6.2-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux") into android-mainline d040a1217797 Merge 57888f7b952d ("Merge tag 'selinux-pr-20221212' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux") into android-mainline d8e38422c9eb Merge bbdf4d54618c ("Merge tag 'audit-pr-20221212' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit") into android-mainline cb464a560c88 Merge 043930b1c889 ("Merge tag 'fuse-update-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse") into android-mainline 9ddd892d9f6a Merge 6df7cc226874 ("Merge tag 'ovl-update-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs") into android-mainline fc27f159455f Merge 4a6bff118740 ("Merge tag 'erofs-for-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs") into android-mainline 13d075daada5 Merge ad0d9da164cb ("Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline 7d377c5eef70 Merge 8129bac60f30 ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline 1641b8f78c12 Merge deb9acc12250 ("Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4") into android-mainline aec87505c76d Merge 6a518afcc206 ("Merge tag 'fs.acl.rework.v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping") into android-mainline 99e144513f03 Merge bd90741318ee ("Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs") into android-mainline 2dbece2f87d1 Merge 96f426356847 ("Merge tag 'rust-6.2' of https://github.com/Rust-for-Linux/linux") into android-mainline 30d31ef51a67 Merge 268325bda529 ("Merge tag 'random-6.2-rc1-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random") into android-mainline 2f21cb814867 Merge ca1443c7e75a ("Merge branch 'for-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu") into android-mainline b8b6a42c990f Merge e1a1ccef7a4f ("Merge tag 'livepatching-for-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching") into android-mainline a28ff6f883a6 Merge bf57ae2165ba ("Merge tag 'sched-core-2022-12-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline 31efdd02d104 Merge add769595757 ("Merge tag 'perf-core-2022-12-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline 9806245d57f1 Merge 617fe4fa82b2 ("Merge tag 'locking-core-2022-12-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline Test: treehugger Bug: 271046760 Change-Id: I7fc2e61ccc5173b521c6ac6a194cc8e274ddd530
2022-05-16Merge "Merge branch tm-release" into tm-gsi-dev am: e51848377e am: ↵SzuWei Lin
8213bd72fc am: bc58829061 am: 17464b0fa0 am: 79f4f79e8d Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/18350456 Change-Id: I8ee3dfe8ab3274af3dc8596664cfb0d0bf550d58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16Merge "Merge "Merge branch tm-release" into tm-gsi-dev am: e51848377e am: ↵Automerger Merge Worker
8213bd72fc am: bc58829061 am: 9540c4e81f" into tm-qpr-dev-plus-aosp am: 19e7eee23c Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/18350456 Change-Id: I6a0ea438a19f05fe1830838bf68ed36a557e59c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16Merge "Merge branch tm-release" into tm-gsi-dev am: e51848377e am: ↵SzuWei Lin
8213bd72fc am: b0c0a55d4b am: a265a99211 am: a224185512 Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/18350456 Change-Id: I9116940187d0b7fc7260daf42590e8e4ed7e3b06 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16Merge "Merge branch tm-release" into tm-gsi-dev am: e51848377e am: ↵main-16k-with-phonesSzuWei Lin
8213bd72fc am: bc58829061 am: 17464b0fa0 Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/18350456 Change-Id: Ifa68d65beaf7e7680bbb52f3be0d16a6c423a236 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16Merge "Merge "Merge branch tm-release" into tm-gsi-dev am: e51848377e am: ↵Automerger Merge Worker
8213bd72fc am: bc58829061 am: 9540c4e81f" into tm-qpr-dev-plus-aosp
2022-05-16Merge "Merge branch tm-release" into tm-gsi-dev am: e51848377e am: ↵SzuWei Lin
8213bd72fc am: b0c0a55d4b am: a265a99211 Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/18350456 Change-Id: Idb7267aa093c18fa85eb6c73f5fb79f0f92992b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16Merge "Merge branch tm-release" into tm-gsi-dev am: e51848377e am: ↵SzuWei Lin
8213bd72fc am: bc58829061 am: 9540c4e81f Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/18350456 Change-Id: I6de65d1ff016cdbd98311e4f3c03dcc8d9a29e79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16Merge "Merge branch tm-release" into tm-gsi-dev am: e51848377e am: ↵SzuWei Lin
8213bd72fc am: bc58829061 Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/18350456 Change-Id: Iffd45fb3a5a1ee5d63f8bd1eefe837709b6e103b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16Merge "Merge branch tm-release" into tm-gsi-dev am: e51848377e am: ↵SzuWei Lin
8213bd72fc am: b0c0a55d4b Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/18350456 Change-Id: I6e321ec089c4899c159c9ea021733f4f1f64df31 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16Merge "Merge branch tm-release" into tm-gsi-dev am: e51848377e am: ↵android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseSzuWei Lin
8213bd72fc am: bc58829061 Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/18350456 Change-Id: Ic7bf9acc9b86c108a2b323612298d7f04c1d4173 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16Merge "Merge branch tm-release" into tm-gsi-dev am: e51848377e am: 8213bd72fcSzuWei Lin
Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/mainline/arm64/+/18350456 Change-Id: I802696b4ff963e9f1da9330a8f6a05387bf5c07a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>