tree e6b78c0127dc040941a7c71597e83ea14df8fc51
parent 1caf81977768719085dd3135691bb4a134e79f9f
parent 17bea26cbec58f86ccce9a3d88b0e24c0c1e4f93
author Greg Kroah-Hartman <gregkh@google.com> 1740220392 +0000
committer Greg Kroah-Hartman <gregkh@google.com> 1740220420 +0000

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

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

* 17bea26cbec5 Merge tag 'android12-5.10.234_r00' into android12-5.10
* 2f598392c515 UPSTREAM: dma-fence: Fix reference leak on fence merge failure path
* e3f3b0baf886 UPSTREAM: dma-buf: fix an error pointer vs NULL bug
* 7567aedc33ea UPSTREAM: dma-buf: keep the signaling time of merged fences v3
* 27f20eaefdb9 UPSTREAM: dma-buf: actually set signaling bit for private stub fences
* 8a5a0de96348 UPSTREAM: dma-buf: set signaling bit for the stub fence
* 6e903a5c1f45 UPSTREAM: dma-buf: Remove the signaled bit status check
* 351db61d355a UPSTREAM: dma-buf: revert "return only unsignaled fences in dma_fence_unwrap_for_each v3"
* 7b3389a1a97f UPSTREAM: dma-buf: generalize dma_fence unwrap & merging v3
* bd2769e4fdab UPSTREAM: dma-buf: return only unsignaled fences in dma_fence_unwrap_for_each v3
* fc0f4d7dcf1f BACKPORT: dma-buf: cleanup dma_fence_unwrap implementation
* 54d0ff9dd6ca UPSTREAM: dma-buf: cleanup dma_fence_unwrap selftest v2
* c186cf297f86 UPSTREAM: dma-buf: cleanup dma_fence_chain_walk
* 2781fe345364 UPSTREAM: dma-buf/sync_file: cleanup fence merging a bit
* 009f0a6dfda1 UPSTREAM: dma-buf: handle empty dma_fence_arrays gracefully
* eccbf603c1cf UPSTREAM: dma-buf/sync-file: fix logic error in new fence merge code
* d2e3466cc975 UPSTREAM: dma-buf/sync-file: fix warning about fence containers
* 2aeb6aef461b BACKPORT: dma-buf: add dma_fence_unwrap v2
* 81b6f83e3300 UPSTREAM: dma-buf: Add dma_fence_array_for_each (v2)
* 005a9bfaa414 UPSTREAM: dma-buf: add dma_fence_chain_contained helper
* 864461168dbd UPSTREAM: dma-buf: clarify dma_fence_add_callback documentation
* b1fe409d2522 UPSTREAM: dma-buf: add dma_fence_chain_alloc/free v3
* 109aa7f8b02d UPSTREAM: drm/syncobj: use newly allocated stub fences
* bc702546abd6 UPSTREAM: dma-buf: use krealloc_array()
* 04bed74afc3c UPSTREAM: mm: slab: provide krealloc_array()
* c31a4e21c9f4 ANDROID: ABI: update symbol list for honor
* f2f0e14b0517 ANDROID: GKI: export usleep_range_state function to support SAGT
* 1b42ee98bc30 ANDROID: vendor_hooks: add vendor hook to support SAGT
* 11421e004a23 UPSTREAM: Revert "PCI: Use preserve_config in place of pci_flags"
* 489c5991a53c ANDROID: GKI: Update symbol list for honor
* ce8e71332a32 UPSTREAM: binder: log transaction code on failure
* ee6bf96d341f UPSTREAM: binder: add failed transaction logging info
* cf3824ab974a BACKPORT: sched/fair: Move update_nohz_stats() to the CONFIG_NO_HZ_COMMON block to simplify the code & fix an unused function warning
* 154d9fa33676 ANDROID: KABI macros to release excess KABI fields for use with backports
* 08fd4e9d6435 UPSTREAM: usb: gadget: u_audio: Check return codes from usb_ep_enable and config_ep_by_speed.
* 887a45b8d82a UPSTREAM: usb: dwc3: core: remove lock of otg mode during gadget suspend/resume to avoid deadlock
* 2b48d05158bd UPSTREAM: xhci: Handle TD clearing for multiple streams case
* 8382bc9b23cc UPSTREAM: KVM: arm64: Fix AArch32 register narrowing on userspace write
* 852ccb6ad051 UPSTREAM: usb: gadget: u_audio: Fix race condition use of controls after free during gadget unbind.

Change-Id: Ic66500a3d24a0e497622d1e83df0b8b431675118
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>