summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-09Snap for 8562061 from e1e7ce8f0e9526760ae284c21bf4318a64511e9d to ↵aml_med_331911000aml_med_331712010aml_med_331612000aml_med_331511000aml_med_331410000aml_med_331318000aml_med_331115000aml_med_331012020android13-mainline-media-releaseAndroid Build Coastguard Worker
mainline-media-release Change-Id: Ic05726a78a2aa336ab1759ef117c4c2e01da0fe4
2022-04-27Revert incorrect TM Branching Stage 4 merges am: df9b86f15baml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010Roman Yepishev
Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/17920100 Change-Id: I8d3682c7c601e12c3b9dc4c23c8bd365161e2b0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22Revert incorrect TM Branching Stage 4 mergest_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devRoman Yepishev
Bug: 230125562 This reverts commit 55e05cc9cfb3716f23e60a6c5f57926490d58762, reversing changes made to 49bafda5795c82232c82ff9506acb4bc2b96cbc7. This reverts commit 49bafda5795c82232c82ff9506acb4bc2b96cbc7, reversing changes made to 94f82ab5ed52116a41e6e927975192701f3c40b9. This reverts commit 94f82ab5ed52116a41e6e927975192701f3c40b9, reversing changes made to b63c6357785cf7fa181a24823264b877e784e6d4. Change-Id: I5269bc685af079ea3b2dbc33c598de85b070753e
2022-04-22Update kernel to builds 7518296 am: 5ade4f4e9b am: fbfd8828e9 am: 4ae838b311 ↵Howard Chen
am: 55e05cc9cf Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/15218264 Change-Id: I7a15dceffcdb5c899d4857e5a07dd9acd3835914 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22Update kernel to builds 7518296 am: 5ade4f4e9b am: fbfd8828e9 am: 4ae838b311Howard Chen
Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/15218264 Change-Id: I1c9ae79b2dc351fc088e87b1fe64f433af70fa5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22Update kernel to builds 7505743 am: 1865401436 am: 6df5a1a7e0 am: 0db23ee4d2 ↵Howard Chen
am: 49bafda579 Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/15142641 Change-Id: Id66d4960ed1c29b89ec8d5339987f328e7b56bfa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22Update kernel to builds 7489573 am: 2d127e6bb9 am: 771cbc4764 am: 163f375117 ↵Howard Chen
am: 94f82ab5ed Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/15100511 Change-Id: Iad5ed1be5e566ebd17a23858fc5889e926c8f0a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22Update kernel to builds 7505743 am: 1865401436 am: 6df5a1a7e0 am: 0db23ee4d2Howard Chen
Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/15142641 Change-Id: I8aeb50527add9b23cd79bf8324af5956e774a947 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22Update kernel to builds 7489573 am: 2d127e6bb9 am: 771cbc4764 am: 163f375117Howard Chen
Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/15100511 Change-Id: Ib3dcfd2e1bb28c0ee2459d9b0cdcb0ac5d986f0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08Added SPDX-license-identifier-GPL-2.0-only to: am: 652b1a06fa am: 4af58ab424 ↵Bob Badour
am: 679ba0e889 am: b63c635778 Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/2058974 Change-Id: Iae510d3e635640b10af90a6c0fb076f48b10af25 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08Added SPDX-license-identifier-GPL-2.0-only to: am: 652b1a06fa am: 4af58ab424 ↵Bob Badour
am: 679ba0e889 Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/2058974 Change-Id: Ie1625f3d458c44b2fad0cba3a864615a12ecd0bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08Added SPDX-license-identifier-GPL-2.0-only to: am: 652b1a06fa am: 4af58ab424Bob Badour
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/2058974 Change-Id: I87fe1696afbb2c5815cc0e20a7296c95362839ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08Added SPDX-license-identifier-GPL-2.0-only to: am: 652b1a06faBob Badour
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/2058974 Change-Id: Id758349f4e43783dd1bc87f1804b1f1ff0c5b61b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Added SPDX-license-identifier-GPL-2.0-only to:Bob Badour
Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Change-Id: I31aecde3d10a6d6500932125720db5ba61872b2a
2022-01-29Snap for 8132238 from 8e9a70491e23a1b87be8ea6cd6efc071e1847f9f to ↵android-mainline-12.0.0_r89android-mainline-12.0.0_r119android-mainline-12.0.0_r104android12-mainline-media-releaseAndroid Build Coastguard Worker
mainline-media-release Change-Id: I36658b846abeb3f9be33310247be0b5de352f228
2022-01-25Update kernel to builds 8108765 am: 19a964376f am: 7f980aa16c am: c93211dd4dHoward Chen
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1958661 Change-Id: Ib2508b15a259ae84003570d711cbde2729d8ba24
2022-01-25Update kernel to builds 8108765 am: 19a964376f am: 7f980aa16cHoward Chen
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1958661 Change-Id: I7a7bcc5a62279b1e990d7301d164b00e304b55bb
2022-01-25Update kernel to builds 8108765 am: 19a964376fandroid12L-gsiHoward Chen
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1958661 Change-Id: Ic40f884732487608862c83d5772480300514842e
2022-01-24Update kernel to builds 8108765Howard Chen
git log --first-parent -100 --oneline --no-decorate 37c7c8d4f085..3307e1a05838: 3307e1a05838 ANDROID: ion: Use nents, orig_nents in struct sg_table correctly 915e227b56d9 Merge tag 'android12-5.4.161_r00' into android12-5.4 fdabaf6a7c54 BACKPORT: userfaultfd: wp: declare _UFFDIO_WRITEPROTECT conditionally feb34d6796b2 ANDROID: kbuild: fix ld_flags missing for LTO 6140ec56536b ANDROID: ABI: Update symbols to unisoc whitelist for the 23th 946eff433f93 UPSTREAM: vfs: fs_context: fix up param length parsing in legacy_parse_param Test: treehugger Bug: 215656013 Change-Id: I2188e4ea3b9002ce7b4ba698914d8db776785c7c
2022-01-21Snap for 8101734 from 113091f184fa983ea0d45d76bec84b420a0a6b17 to ↵Android Build Coastguard Worker
mainline-media-release Change-Id: Ic06434fcdd7e02131863bd880807d05a55dee50a
2022-01-20Update kernel to builds 8086404 am: f73c0f27e5 am: 90a6cf7e26 am: 21966cbfcfHoward Chen
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1953485 Change-Id: I0bef62e34de985801036f2bc712af2d816f823da
2022-01-20Update kernel to builds 8086404 am: f73c0f27e5 am: 90a6cf7e26Howard Chen
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1953485 Change-Id: Ie2bbbc71f3fa498aaaddf2a314a8fa59bf8d87e8
2022-01-20Update kernel to builds 8086404 am: f73c0f27e5Howard Chen
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1953485 Change-Id: I9fc8faa1e59a56e4e359283e393b8a85d6171adf
2022-01-19Update kernel to builds 8086404Howard Chen
git log --first-parent -100 --oneline --no-decorate 5b673be0c6b0..37c7c8d4f085: 37c7c8d4f085 UPSTREAM: drivers core: Use sysfs_emit and sysfs_emit_at for show(device *...) functions bdf17ba62809 UPSTREAM: x86/pci: Fix the function type for check_reserved_t Test: treehugger Bug: 215296329 Change-Id: Iffc6b917fcd5b0bc3e92cd487f5009757302a719
2021-12-25Snap for 8029545 from 4f5b3a0c8dfaab5b864091659b213a6460981c97 to ↵android-mainline-12.0.0_r74Android Build Coastguard Worker
mainline-media-release Change-Id: Ib871660c884d318d11c1a608eddb6b20e9ff3ab1
2021-12-21Update kernel to builds 8005896 am: db2322c57e am: d66f79f176 am: 4ca05b6444Howard Chen
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1927231 Change-Id: Idf52449049c7d39a0065abc9f686290559709502
2021-12-21Update kernel to builds 8005896 am: db2322c57e am: d66f79f176Howard Chen
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1927231 Change-Id: I4ad933749cd77fe8a5a294ff68c9ce91c9b91b80
2021-12-21Update kernel to builds 8005896 am: db2322c57eHoward Chen
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1927231 Change-Id: I1bf1aa385b6471612049bf67d8b582a5930c67b0
2021-12-21Update kernel to builds 8005896Howard Chen
git log --first-parent -100 --oneline --no-decorate b9c4f1b9b54a..5b673be0c6b0: 5b673be0c6b0 FROMGIT: USB: gadget: bRequestType is a bitfield, not a enum c08b8832fb77 UPSTREAM: aio: fix use-after-free due to missing POLLFREE handling 4781852c038d UPSTREAM: aio: keep poll requests on waitqueue until completed 9dcc14f60d57 UPSTREAM: signalfd: use wake_up_pollfree() e2f186a1f4d7 UPSTREAM: binder: use wake_up_pollfree() 44bababb18ce UPSTREAM: wait: add wake_up_pollfree() f49b6425bf2f UPSTREAM: USB: gadget: zero allocate endpoint 0 buffers fa64a30acf94 UPSTREAM: USB: gadget: detect too-big endpoint 0 requests 12a69ef55cdd UPSTREAM: HID: check for valid USB device for many HID drivers 4fd09f7a7972 UPSTREAM: HID: wacom: fix problems when device is not a valid USB device 058f168e90d2 UPSTREAM: HID: bigbenff: prevent null pointer dereference 610bdbf89125 UPSTREAM: HID: add USB_HID dependancy on some USB HID drivers 027774af73b8 UPSTREAM: HID: add USB_HID dependancy to hid-chicony 553fa87e4b04 UPSTREAM: HID: add USB_HID dependancy to hid-prodikeys 4a83f2f66cb5 UPSTREAM: HID: add hid_is_usb() function to make it simpler for USB detection 93698d0219f2 ANDROID: ABI: Update symbols to unisoc whitelist for the 22st 97b7ffb32f29 ANDROID: f2fs: check nr_pages for readahead 0bbc71d87f4d ANDROID: usb: gadget: f_accessory: Mitgate handling of non-existent USB request 697fba25ed27 FROMGIT: binder: fix test regression due to sender_euid change 3070f4b00b5a BACKPORT: binder: use cred instead of task for getsecid f51c08be625c BACKPORT: binder: use cred instead of task for selinux checks a850383d7750 BACKPORT: binder: use euid from cred instead of using task 88d88955ae0b ANDROID: GKI: psci: add hook to check if cpu is allowed to power off 2cdbd9b44172 ANDROID: setlocalversion: make KMI_GENERATION optional 879962cb9a2c ANDROID: ABI: Update symbols to unisoc whitelist for the 21st Test: treehugger Bug: 211561016 Change-Id: Ic055771032ccaac4acff94d1c3112a8ea687a0c5
2021-11-27Snap for 7949676 from fff5fc1625d3c5823cad4aa4c1b71b6ca64ce720 to ↵android-mainline-12.0.0_r62Android Build Coastguard Worker
mainline-media-release Change-Id: Ibce89ab646500b357e979981267efa99790cda36
2021-11-22Update kernel to builds 7915175 am: 8a03b12ec8 am: 358dc4003c am: fa891916ceHoward Chen
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1893463 Change-Id: I5a6b673e668b0a7a26850770d42184b00c4645c1
2021-11-22Update kernel to builds 7915175 am: 8a03b12ec8 am: 358dc4003cHoward Chen
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1893463 Change-Id: I812cc1d6c0f5d34592e8c96e5d76a29c501e5153
2021-11-22Update kernel to builds 7915175 am: 8a03b12ec8Howard Chen
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1893463 Change-Id: Ie045890135802178762d22bc8e65644af6b10bf7
2021-11-20Snap for 7934409 from 297b976d3ac311649ae51e4853f1e1befc2ae1a0 to ↵Android Build Coastguard Worker
mainline-media-release Change-Id: Ia3fe7b9a18bc7e328c8674d3b55c59e5e80886c1
2021-11-19Update kernel to builds 7915175Howard Chen
git log --first-parent -100 --oneline --no-decorate 7eb444cc279e..b9c4f1b9b54a: b9c4f1b9b54a ANDROID: ABI: Update symbols to unisoc whitelist for the twentieth time 60bad4df861d ANDROID: userfaultfd: Fix untag pointer in userfaultfd_continue() f49f3b377eae ANDROID: GKI: rework the ANDROID_KABI_USE() macro to not use __UNIQUE() 2138e7367558 ANDROID: Incremental fs: Fix dentry get/put imbalance on vfs_mkdir() failure cbb80ec0faf2 ANDROID: f2fs: fix potential deadlock by android ftrace Test: treehugger Bug: 206745249 Change-Id: Idf2699a8b6ecd7f875c733fd8cbefe616d100de5
2021-11-15[automerger skipped] Update kernel to builds 7855344 am: d209680f6e -s ours ↵Howard Chen
am: 18105aec57 -s ours am: 47841653d3 -s ours am skip reason: Merged-In Id1594796934bff0f3cde63e1dbc39aaf277df150 with SHA-1 9d3f391033 is already in history Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1890109 Change-Id: I656472c86fb8e32cb8ebf01853dd3e9b8ef4b120
2021-11-15[automerger skipped] Update kernel to builds 7855344 am: d209680f6e -s ours ↵Howard Chen
am: 18105aec57 -s ours am skip reason: Merged-In Id1594796934bff0f3cde63e1dbc39aaf277df150 with SHA-1 9d3f391033 is already in history Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1890109 Change-Id: I7d25a6f08493bbedf7a4a7c262383177219f9a9a
2021-11-15[automerger skipped] Update kernel to builds 7855344 am: d209680f6e -s oursHoward Chen
am skip reason: Merged-In Id1594796934bff0f3cde63e1dbc39aaf277df150 with SHA-1 9d3f391033 is already in history Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1890109 Change-Id: I515e0b0fcb8824fc1e773e7809ea29ca35ba0423
2021-11-12Update kernel to builds 7855344Howard Chen
git log --first-parent -100 --oneline --no-decorate 546305780d82..7eb444cc279e: 7eb444cc279e ANDROID: ABI: update symbols to sunxi whitelist for drm heap driver bbd9447b7834 ANDROID: ABI: update symbols to sunxi whitelist for video driver eb4a5a5dbd5b ANDROID: ion heap: init ion heaps in subsys_initcall 792619fa3479 UPSTREAM: ovl: simplify file splice 42241f052981 Merge tag 'android12-5.4.147_r00' into android12-5.4 111d022d4e82 ANDROID: ABI: update symbols to sunxi whitelist for wifi modules 5970ec26e0c8 FROMGIT: f2fs: fix to use WHINT_MODE 73e6d86c30ee ANDROID: ABI: update symbols to unisoc whitelist for the nineteen time 2ffb0acdabc5 UPSTREAM: usb: max-3421: Prevent corruption of freed memory 23c18f1ad0fc FROMLIST: dm-verity: skip verity_handle_error on I/O errors 091c7c49aa71 ANDROID: distribute Module.symvers instead of vmlinux.symvers 1e429b8f9eb9 ANDROID: drivers: gpu: drm: increase the MAX_DRM_OPEN_COUNT 12806d81361b ANDROID: mm: Create an new handler for extra_free_kbytes d5fa5fb1ccb2 UPSTREAM: seccomp: Fix setting loaded filter count during TSYNC 097b74e5c4c3 UPSTREAM: net/xfrm/compat: Copy xfrm_spdattr_type_t atributes 408f4eed7f56 UPSTREAM: udp: properly flush normal packet at GRO time e975646dd997 UPSTREAM: kfence: unconditionally use unbound work queue e566363059ea UPSTREAM: net: xfrm: fix memory leak in xfrm_user_rcv_msg 90bfc73e237f UPSTREAM: psi: Fix race between psi_trigger_create/destroy 83f5502f4ebb UPSTREAM: loop: Fix missing discard support when using LOOP_CONFIGURE f70f4e8b9ccf UPSTREAM: thermal/drivers/sprd: Add missing MODULE_DEVICE_TABLE 1dd5f2846c8f UPSTREAM: crypto: x86/curve25519 - fix cpu feature checking logic in mod_exit 08da15b412dc UPSTREAM: tools/bootconfig: Fix error return code in apply_xbc() 83fcc37790bf UPSTREAM: kfence: use TASK_IDLE when awaiting allocation 0bd36fc71dc1 BACKPORT: wireguard: peer: allocate in kmem_cache d7724e1f0b54 UPSTREAM: nvmem: sprd: Fix an error message e80cd63ff8ba UPSTREAM: selinux: add proper NULL termination to the secclass_map permissions 8f876418a429 UPSTREAM: pinctrl: sunxi: fix irq bank map for the Allwinner A100 pin controller 0bd16966f22d UPSTREAM: loop: Set correct device size when using LOOP_CONFIGURE 066bfa35119c UPSTREAM: loop: unset GENHD_FL_NO_PART_SCAN on LOOP_CONFIGURE d52ac987ad2a UPSTREAM: security: selinux: allow per-file labeling for bpffs 1a97657426d5 ANDROID: fs/fuse: Keep FUSE file times consistent with lower file Test: treehugger Bug: 205502588 Change-Id: Id1594796934bff0f3cde63e1dbc39aaf277df150 Merged-In: Id1594796934bff0f3cde63e1dbc39aaf277df150
2021-10-30Snap for 7869090 from 184a92e6a096484586d5b18a8147a17c7f281f99 to ↵android-mainline-12.0.0_r46Android Build Coastguard Worker
mainline-media-release Change-Id: I9da98ac82b19445ad433c306fe2cfcb671921576
2021-10-28Update kernel to builds 7855344 am: 9d3f391033 am: 842455db7aHoward Chen
Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/16128719 Change-Id: I89a1783028cec3123264c4677598273893294d0f
2021-10-28Update kernel to builds 7855344 am: 9d3f391033Howard Chen
Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/16128719 Change-Id: I1b5c12d9f16330e1f034ff32e62354b14b939f72
2021-10-27Update kernel to builds 7855344Howard Chen
git log --first-parent -100 --oneline --no-decorate 546305780d82..7eb444cc279e: 7eb444cc279e ANDROID: ABI: update symbols to sunxi whitelist for drm heap driver bbd9447b7834 ANDROID: ABI: update symbols to sunxi whitelist for video driver eb4a5a5dbd5b ANDROID: ion heap: init ion heaps in subsys_initcall 792619fa3479 UPSTREAM: ovl: simplify file splice 42241f052981 Merge tag 'android12-5.4.147_r00' into android12-5.4 111d022d4e82 ANDROID: ABI: update symbols to sunxi whitelist for wifi modules 5970ec26e0c8 FROMGIT: f2fs: fix to use WHINT_MODE 73e6d86c30ee ANDROID: ABI: update symbols to unisoc whitelist for the nineteen time 2ffb0acdabc5 UPSTREAM: usb: max-3421: Prevent corruption of freed memory 23c18f1ad0fc FROMLIST: dm-verity: skip verity_handle_error on I/O errors 091c7c49aa71 ANDROID: distribute Module.symvers instead of vmlinux.symvers 1e429b8f9eb9 ANDROID: drivers: gpu: drm: increase the MAX_DRM_OPEN_COUNT 12806d81361b ANDROID: mm: Create an new handler for extra_free_kbytes d5fa5fb1ccb2 UPSTREAM: seccomp: Fix setting loaded filter count during TSYNC 097b74e5c4c3 UPSTREAM: net/xfrm/compat: Copy xfrm_spdattr_type_t atributes 408f4eed7f56 UPSTREAM: udp: properly flush normal packet at GRO time e975646dd997 UPSTREAM: kfence: unconditionally use unbound work queue e566363059ea UPSTREAM: net: xfrm: fix memory leak in xfrm_user_rcv_msg 90bfc73e237f UPSTREAM: psi: Fix race between psi_trigger_create/destroy 83f5502f4ebb UPSTREAM: loop: Fix missing discard support when using LOOP_CONFIGURE f70f4e8b9ccf UPSTREAM: thermal/drivers/sprd: Add missing MODULE_DEVICE_TABLE 1dd5f2846c8f UPSTREAM: crypto: x86/curve25519 - fix cpu feature checking logic in mod_exit 08da15b412dc UPSTREAM: tools/bootconfig: Fix error return code in apply_xbc() 83fcc37790bf UPSTREAM: kfence: use TASK_IDLE when awaiting allocation 0bd36fc71dc1 BACKPORT: wireguard: peer: allocate in kmem_cache d7724e1f0b54 UPSTREAM: nvmem: sprd: Fix an error message e80cd63ff8ba UPSTREAM: selinux: add proper NULL termination to the secclass_map permissions 8f876418a429 UPSTREAM: pinctrl: sunxi: fix irq bank map for the Allwinner A100 pin controller 0bd16966f22d UPSTREAM: loop: Set correct device size when using LOOP_CONFIGURE 066bfa35119c UPSTREAM: loop: unset GENHD_FL_NO_PART_SCAN on LOOP_CONFIGURE d52ac987ad2a UPSTREAM: security: selinux: allow per-file labeling for bpffs 1a97657426d5 ANDROID: fs/fuse: Keep FUSE file times consistent with lower file Test: treehugger Bug: 204261027 Change-Id: Id1594796934bff0f3cde63e1dbc39aaf277df150
2021-10-08[automerger skipped] Merge Android 12 am: ff91a34375 -s ours am: ee3e4509ac ↵Xin Li
-s ours am: 39c6087ebd -s ours am: 71ee8b38d1 -s ours am: b70d46f8b3 -s ours am skip reason: Merged-In I304299133d16934b75e9c7d11cacc15ea20b8ea6 with SHA-1 64557aefcc is already in history Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1847713 Change-Id: Ie147c34d489d6bcd508a6efd5c7763f02f1082ac
2021-10-08[automerger skipped] Merge Android 12 am: ff91a34375 -s ours am: ee3e4509ac ↵Xin Li
-s ours am: 39c6087ebd -s ours am: 71ee8b38d1 -s ours am skip reason: Merged-In I304299133d16934b75e9c7d11cacc15ea20b8ea6 with SHA-1 64557aefcc is already in history Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1847713 Change-Id: I0d9af2351c0bde52c244e1da7f78c67fee968134
2021-10-08[automerger skipped] Merge Android 12 am: ff91a34375 -s ours am: ee3e4509ac ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1temp_sam_210511427android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
-s ours am: 39c6087ebd -s ours am skip reason: Merged-In I304299133d16934b75e9c7d11cacc15ea20b8ea6 with SHA-1 64557aefcc is already in history Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1847713 Change-Id: I7135e0fdb05669996a517e53429a89947863a3d0
2021-10-08[automerger skipped] Merge Android 12 am: ff91a34375 -s ours am: ee3e4509ac ↵Xin Li
-s ours am skip reason: Merged-In I304299133d16934b75e9c7d11cacc15ea20b8ea6 with SHA-1 64557aefcc is already in history Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1847713 Change-Id: If8f5cc28bef1eaa8a9483426fe8a6ab4d2f8a749
2021-10-08[automerger skipped] Merge Android 12 am: ff91a34375 -s oursXin Li
am skip reason: Merged-In I304299133d16934b75e9c7d11cacc15ea20b8ea6 with SHA-1 64557aefcc is already in history Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1847713 Change-Id: I492e500e4155cfa122c10811dba2c15de3fbd31e
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: I304299133d16934b75e9c7d11cacc15ea20b8ea6 Change-Id: I060490abdb4e82e5b80d3571c7ac92c35a545fe2
2021-09-25Snap for 7767684 from b23d9ce6839fc22e08535ca577437c75856ff229 to ↵android-mainline-12.0.0_r29Android Build Coastguard Worker
mainline-media-release Change-Id: Ie6a689964b7e5a144b8fc2c64ca3813507dd3596
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 18:45:09 +0000