Skip to content
Snippets Groups Projects
Commit 9c3241c2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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


Catch the -lts branch up with some commits that are in android12-5.10.
Changes in here include the following:

* d0d935fb Merge tag 'android12-5.10.230_r00' into android12-5.10
* f1e8560e UPSTREAM: usb: xhci: Implement xhci_handshake_check_state() helper
* 16ec1f44 Revert "UPSTREAM: unicode: Don't special case ignorable code points"
* 5f6a8581 Reapply "UPSTREAM: unicode: Don't special case ignorable code points"
* 420c4810 Revert "UPSTREAM: unicode: Don't special case ignorable code points"
* 122661c6 ANDROID: fix kernelci build break: redefinition of 'kallsyms_on_each_symbol'
* 1530d11f UPSTREAM: vsock/virtio: Initialization of the dangling pointer occurring in vsk->trans
* 7d7b7d02 UPSTREAM: f2fs: modify f2fs_is_checkpoint_ready logic to allow more data to be written with the CP disable
* 556f793a BACKPORT: f2fs: introduce get_available_block_count() for cleanup
* 7c627b9b ANDROID: ABI: update symbol list for honor
* 5f45a7ef ANDROID: fs: add vendor hook to collect IO statistics
* 35fae484 ANDROID: tools/objtool: Pass CFLAGS to libsubcmd build via EXTRA_CFLAGS
* b6f4fd26 UPSTREAM: HID: core: zero-initialize the report buffer
* b0e9b554 Merge tag 'android12-5.10.228_r00' into android12-5.10
* 7098f838 ANDROID: libsubcmd: Hoist iterator variable declarations in parse_options_subcommand()
* 1fed2de8 ANDROID: mm: Fix SPF-aware fast-mremap
* b396c229 UPSTREAM: net/sched: stop qdisc_tree_reduce_backlog on TC_H_ROOT
* a8339e7f UPSTREAM: f2fs: support SEEK_DATA and SEEK_HOLE for compression files
* 894861d6 ANDROID: add file for recording allowed ABI breaks
* 2936e6a8 ANDROID: GKI: update symbol list for honor
* e05e6574 ANDROID: Allow vendor modules perform more operations on memleak detect
* 900cb56f UPSTREAM: drm/omap: fix misleading indentation in pixinc()
* ef536a1d UPSTREAM: bitfield: build kunit tests without structleak plugin
* db11e829 BACKPORT: FROMGIT: binder: add delivered_freeze to debugfs output
* a204f3aa BACKPORT: FROMGIT: binder: fix memleak of proc->delivered_freeze
* 5a884658 FROMGIT: binder: allow freeze notification for dead nodes
* f357f2a8 FROMGIT: binder: fix BINDER_WORK_CLEAR_FREEZE_NOTIFICATION debug logs
* 4e4b2cf3 FROMGIT: binder: fix BINDER_WORK_FROZEN_BINDER debug logs
* 2bd6b2ab BACKPORT: FROMGIT: binder: fix freeze UAF in binder_release_work()
* df183ec3 FROMGIT: binder: fix OOB in binder_add_freeze_work()
* 8f52d7a1 FROMGIT: binder: fix node UAF in binder_add_freeze_work()
* e733b347 ANDROID: GKI: Update symbols to symbol list
* ee2e0e62 BACKPORT: f2fs: compress: fix to update i_compr_blocks correctly
* de373c69 UPSTREAM: cfg80211: add VHT rate entries for MCS-10 and MCS-11
* b6e11f91 UPSTREAM: USB: media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format

Change-Id: I777eb297a34360d98ccbb9384f0368d17da004aa
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents d8d2f8af d0d935fb
No related branches found
No related tags found
Loading
Showing
with 5275 additions and 5002 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment