Commit 8a427269 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android13-5.10' into branch 'android13-5.10-lts'



Catch up with some commits applied to the android13-5.10 branch that
adds new symbols to ensure that the ABI remains stable with LTS merges.

This merge contains the following commits:

* ee5ff26e UPSTREAM: KVM: arm64: PMU: Restore the guest's EL0 event counting after migration
* 59b8fa4b UPSTREAM: kfence: avoid passing -g for test
* 0a01f8f1 UPSTREAM: Revert "kasan: drop skip_kasan_poison variable in free_pages_prepare"
* 6e6f92c6 UPSTREAM: coresight: etm4x: Do not access TRCIDR1 for identification
* 2ce161a9 UPSTREAM: KVM: arm64: Limit length in kvm_vm_ioctl_mte_copy_tags() to INT_MAX
* 2366e840 UPSTREAM: usb: typec: tcpm: fix warning when handle discover_identity message
* 54d2326d ANDROID: set kmi_symbol_list_add_only for Kleaf builds.
* fb6a4e60 Merge tag 'android13-5.10.186_r00' into android13-5.10
* 054fa578 FROMLIST: fuse: revalidate: don't invalidate if interrupted
* 09577959 UPSTREAM: gfs2: Don't deref jdesc in evict
* 99685b94 UPSTREAM: media: dvb-core: Fix kernel WARNING for blocking operation in wait_event*()
* 9f44f810 ANDROID: KVM: arm64: Fix MMU context save/restore over TLB invalidation
* 5a4d20a3 ANDROID: Incremental fs: Allocate data buffer based on input request size
* f17cd56e BACKPORT: irqchip/gic-v3: Work around affinity issues on ASR8601
* 035e150e BACKPORT: irqchip/gic-v3: Improve affinity helper
* d1ad7188 UPSTREAM: f2fs: fix deadlock in i_xattr_sem and inode page lock
* 50e27d9c Revert "FROMLIST: f2fs: remove i_xattr_sem to avoid deadlock and fix the original issue"
* 08014c39 UPSTREAM: rcu/kvfree: Avoid freeing new kfree_rcu() memory after old grace period
* 10553f05 UPSTREAM: usb: gadget: udc: renesas_usb3: Fix use after free bug in renesas_usb3_remove due to race condition
* 4bf37318 UPSTREAM: media: rkvdec: fix use after free bug in rkvdec_remove
* d145f37a UPSTREAM: relayfs: fix out-of-bounds access in relay_file_read
* 93f6faa1 UPSTREAM: x86/mm: Avoid using set_pgd() outside of real PGD pages
* 591de421 UPSTREAM: io_uring: hold uring mutex around poll removal
* 50b2a055 UPSTREAM: net/sched: flower: fix possible OOB write in fl_set_geneve_opt()
* ac6253da UPSTREAM: f2fs: fix to avoid use-after-free for cached IPU bio
* 1598ae20 UPSTREAM: ipvlan:Fix out-of-bounds caused by unclear skb->cb
* b05ab3eb UPSTREAM: Revert "Fix XFRM-I support for nested ESP tunnels"
* d359116c ANDROID: GKI: Add symbol list for telechips
* 6f19f806 UPSTREAM: net/sched: cls_u32: Fix reference counter leak leading to overflow
* 7366d151 FROMLIST: f2fs: remove i_xattr_sem to avoid deadlock and fix the original issue
* 26fdb5f5 ANDROID: fuse-bpf: Move FUSE_RELEASE to correct place
* 8be0098c ANDROID: HID: Only utilise UHID provided exports if UHID is enabled
* 424275e0 ANDROID: GKI: rockchip: add symbols for some media/snd.
* f6df2208 UPSTREAM: xfs: verify buffer contents when we skip log replay
* 93ca6372 UPSTREAM: memstick: r592: Fix UAF bug in r592_remove due to race condition
* ef103c35 BACKPORT: btrfs: unset reloc control if transaction commit fails in prepare_to_relocate()
* 431595fc UPSTREAM: bluetooth: Perform careful capability checks in hci_sock_ioctl()
* a366f6cd ANDROID: GKI: rockchip: add symbols for pciexxx
* 8e8021e6 ANDROID: GKI: ASR: Update the ABI representation
* 6e1d82fc ANDROID: HID; Over-ride default maximum buffer size when using UHID
* 4d9cc0c1 BACKPORT: FROMGIT: usb: core: add sysfs entry for usb device state
* 5991a94d ANDROID: GKI: rockchip: Add symbols for ch341
* 31cdb217 UPSTREAM: net: cdc_ncm: Deal with too low values of dwNtbOutMaxSize
* 9abde55b UPSTREAM: mailbox: mailbox-test: fix a locking issue in mbox_test_message_write()
* 75934d7a ANDROID: fuse-bpf: Ensure bpf field can never be nulled
* dbfab630 UPSTREAM: mailbox: mailbox-test: Fix potential double-free in mbox_test_message_write()
* 076a4937 ANDROID: sched/fair: unlink misfit from cpu overutilized
* c7a5e5c2 UPSTREAM: 9p/xen : Fix use after free bug in xen_9pfs_front_remove due to race condition
* 4d6ebe97 UPSTREAM: usb: gadget: uvc: queue empty isoc requests if no video buffer is available
* 666788c2 ANDROID: fix a race between speculative page walk and unmap operations
* 99c4f073 BACKPORT: mm: multi-gen LRU: retry pages written back while isolated

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