Commit 27b0c0ac authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android12-5.10' into android12-5.10-lts



Catch up on the non-lts changes.  Commits in here include:

* 17bea26c Merge tag 'android12-5.10.234_r00' into android12-5.10
* 2f598392 UPSTREAM: dma-fence: Fix reference leak on fence merge failure path
* e3f3b0ba UPSTREAM: dma-buf: fix an error pointer vs NULL bug
* 7567aedc UPSTREAM: dma-buf: keep the signaling time of merged fences v3
* 27f20eae UPSTREAM: dma-buf: actually set signaling bit for private stub fences
* 8a5a0de9 UPSTREAM: dma-buf: set signaling bit for the stub fence
* 6e903a5c UPSTREAM: dma-buf: Remove the signaled bit status check
* 351db61d UPSTREAM: dma-buf: revert "return only unsignaled fences in dma_fence_unwrap_for_each v3"
* 7b3389a1 UPSTREAM: dma-buf: generalize dma_fence unwrap & merging v3
* bd2769e4 UPSTREAM: dma-buf: return only unsignaled fences in dma_fence_unwrap_for_each v3
* fc0f4d7d BACKPORT: dma-buf: cleanup dma_fence_unwrap implementation
* 54d0ff9d UPSTREAM: dma-buf: cleanup dma_fence_unwrap selftest v2
* c186cf29 UPSTREAM: dma-buf: cleanup dma_fence_chain_walk
* 2781fe34 UPSTREAM: dma-buf/sync_file: cleanup fence merging a bit
* 009f0a6d UPSTREAM: dma-buf: handle empty dma_fence_arrays gracefully
* eccbf603 UPSTREAM: dma-buf/sync-file: fix logic error in new fence merge code
* d2e3466c UPSTREAM: dma-buf/sync-file: fix warning about fence containers
* 2aeb6aef BACKPORT: dma-buf: add dma_fence_unwrap v2
* 81b6f83e UPSTREAM: dma-buf: Add dma_fence_array_for_each (v2)
* 005a9bfa UPSTREAM: dma-buf: add dma_fence_chain_contained helper
* 86446116 UPSTREAM: dma-buf: clarify dma_fence_add_callback documentation
* b1fe409d UPSTREAM: dma-buf: add dma_fence_chain_alloc/free v3
* 109aa7f8 UPSTREAM: drm/syncobj: use newly allocated stub fences
* bc702546 UPSTREAM: dma-buf: use krealloc_array()
* 04bed74a UPSTREAM: mm: slab: provide krealloc_array()
* c31a4e21 ANDROID: ABI: update symbol list for honor
* f2f0e14b ANDROID: GKI: export usleep_range_state function to support SAGT
* 1b42ee98 ANDROID: vendor_hooks: add vendor hook to support SAGT
* 11421e00 UPSTREAM: Revert "PCI: Use preserve_config in place of pci_flags"
* 489c5991 ANDROID: GKI: Update symbol list for honor
* ce8e7133 UPSTREAM: binder: log transaction code on failure
* ee6bf96d UPSTREAM: binder: add failed transaction logging info
* cf3824ab BACKPORT: sched/fair: Move update_nohz_stats() to the CONFIG_NO_HZ_COMMON block to simplify the code & fix an unused function warning
* 154d9fa3 ANDROID: KABI macros to release excess KABI fields for use with backports
* 08fd4e9d UPSTREAM: usb: gadget: u_audio: Check return codes from usb_ep_enable and config_ep_by_speed.
* 887a45b8 UPSTREAM: usb: dwc3: core: remove lock of otg mode during gadget suspend/resume to avoid deadlock
* 2b48d051 UPSTREAM: xhci: Handle TD clearing for multiple streams case
* 8382bc9b UPSTREAM: KVM: arm64: Fix AArch32 register narrowing on userspace write
* 852ccb6a UPSTREAM: usb: gadget: u_audio: Fix race condition use of controls after free during gadget unbind.

Change-Id: Ic66500a3d24a0e497622d1e83df0b8b431675118
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 1caf8197 17bea26c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment