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

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



Catch up on the android13-5.10 branch changes now that the LTS merge has
completed.  This consists of the following changes:

620f443b5a7c Merge branch 'android13-5.10' into android13-5.10-lts
45b8bb88 ANDROID: GKI: abi_gki_aarch64_rtkstb: Add symbols for rtkstb heap driver
f075722c UPSTREAM: KVM: x86: do not report a vCPU as preempted outside instruction boundaries
0dd2671d UPSTREAM: perf: fix perf_event_context->time
ab3443a8 UPSTREAM: perf/core: Fix perf_output_begin parameter is incorrectly invoked in perf_event_bpf_output
17814752 ANDROID: Update the ABI representation
1f7d2102 ANDROID: Add new hook to enable overriding uclamp_validate()
30b4fb9c Revert "FROMGIT: usb: gadget: udc: core: Prevent redundant calls to pullup"
40259b07 BACKPORT: FROMGIT: Multi-gen LRU: fix workingset accounting
54f6e68a Merge "Merge tag 'android13-5.10.177_r00' into android13-5.10" into android13-5.10
44a76dd3 Merge tag 'android13-5.10.177_r00' into android13-5.10
5dac3213 UPSTREAM: ext4: avoid a potential slab-out-of-bounds in ext4_group_desc_csum
a31be8d9 ANDROID: vendor_hooks: add vendor hook for dma_heap_buffer_alloc
067da03e ANDROID: teo: Extend ifdef protection for accessing sched_cpu_util
dae3ca47 UPSTREAM: perf: Fix check before add_event_to_groups() in perf_group_detach()
1e3cd93b BACKPORT: cpuidle: teo: Introduce util-awareness
5ef34fcc UPSTREAM: cpuidle: teo: Optionally skip polling states in teo_find_shallower_state()
f9372603 UPSTREAM: cpuidle: teo: Rename two local variables in teo_select()
9587661e UPSTREAM: cpuidle: teo: Fix alternative idle state lookup
7847e260 UPSTREAM: cpuidle: teo: remove unneeded semicolon in teo_select()
69b4d76d UPSTREAM: cpuidle: teo: Use kerneldoc documentation in admin-guide
be4e6d0d UPSTREAM: cpuidle: teo: Rework most recent idle duration values treatment
ffffed91 BACKPORT: mm: Multi-gen LRU: remove wait_event_killable()
80f43853 ANDROID: mm: do not allow file-backed pages from CMA
d6606e07 UPSTREAM: kvm: initialize all of the kvm_debugregs structure before sending it to userspace
ab5254f0 UPSTREAM: ext4: fix invalid free tracking in ext4_xattr_move_to_block()
d86ca5aa ANDROID: GKI: Add ASR KMI symbol list
33b1e2eb Revert "Revert "mm/rmap: Fix anon_vma->degree ambiguity leading to double-reuse""
c10825de UPSTREAM: cpuidle: teo: Change the main idle state selection logic
39e84907 UPSTREAM: cpuidle: teo: Cosmetic modification of teo_select()
5888edb6 UPSTREAM: cpuidle: teo: Cosmetic modifications of teo_update()
17792ef0 UPSTREAM: cpuidle: teo: Take negative "sleep length" values into account
8187ee16 UPSTREAM: cpuidle: teo: Adjust handling of very short idle times
c3c739b8 FROMLIST: binder: fix UAF caused by faulty buffer cleanup
c9fa00ae ANDROID: mm: retry GUP with orignal gup_flags on failure
0dfc3199 ANDROID: GKI: Increase max 8250 uarts
c8ff430b BACKPORT: f2fs: give priority to select unpinned section for foreground GC
1529a2db BACKPORT: f2fs: check pinfile in gc_data_segment() in advance
cbc2ec3f UPSTREAM: ext4: fix use-after-free in ext4_xattr_set_entry
c8f9713e UPSTREAM: ext4: remove duplicate definition of ext4_xattr_ibody_inline_set()
5deed326 UPSTREAM: Revert "ext4: fix use-after-free in ext4_xattr_set_entry"
06005931 ANDROID: fuse-bpf: Fix bpf_test_xattr testcase error
64366661 ANDROID: fuse-bpf: Simplify and fix setting bpf program
95672123 ANDROID: fuse-bpf: Fix fuse_dentry_revalidate
d2b52cbb FROMGIT: usb: gadget: udc: core: Prevent redundant calls to pullup
af9ff24a BACKPORT: FROMGIT: usb: gadget: udc: core: Invoke usb_gadget_connect only when started
fa41464b ANDROID: KVM: arm64: Move addr_is_allowed_memory() check into host callback
18206ce8 ANDROID: KVM: arm64: Pass addr to get_page_state() helper
736fe45d UPSTREAM: usb: typec: tcpm: Add support for altmodes
01876c1f UPSTREAM: usb: typec: Add typec_port_register_altmodes()
91fdd255 ANDROID: GKI: Add RTK STB KMI symbol list
2f2c6f2c BACKPORT: usb: dwc3: gadget: Ignore End Transfer delay on teardown
f3d296bf BACKPORT: usb: dwc3: gadget: Only End Transfer for ep0 data phase
ebf7be52 BACKPORT: usb: dwc3: gadget: Don't delay End Transfer on delayed_status
c0b28ac8 BACKPORT: usb: dwc3: gadget: Do not clear ep delayed stop flag during ep disable
1c7619e6 BACKPORT: usb: dwc3: Avoid unmapping USB requests if endxfer is not complete
b81867fc BACKPORT: usb: dwc3: gadget: Delay issuing End Transfer
b3f4451b BACKPORT: usb: dwc3: gadget: Wait for ep0 xfers to complete during dequeue
7ded5917 BACKPORT: usb: dwc3: gadget: move cmd_endtransfer to extra function
6b86d523 ANDROID: mm/filemap: Fix missing put_page() for speculative page fault
5fde5975 ANDROID: dma-buf: heaps: Don't lock unused dmabuf_page_pool mutex
f8d8d72a UPSTREAM: of: reserved_mem: Use proper binary prefix
a550d93c UPSTREAM: mm: multi-gen LRU: fix crash during cgroup migration
ec8b02c9 UPSTREAM: usb: gadget: f_uac2: Fix incorrect increment of bNumEndpoints
68b35dfe UPSTREAM: KVM: arm64: GICv4.1: Fix race with doorbell on VPE activation/deactivation
40fc945d BACKPORT: hugetlb: unshare some PMDs when splitting VMAs
e651e224 UPSTREAM: KVM: arm64: Free hypervisor allocations if vector slot init fails
446883fc UPSTREAM: pstore: Properly assign mem_type property
2261d5cc UPSTREAM: scsi: ufs: core: WLUN suspend SSU/enter hibern8 fail recovery
8e79f14b UPSTREAM: KVM: arm64: Fix benign bug with incorrect use of VA_BITS
06e6e843 UPSTREAM: coresight: trbe: remove cpuhp instance node before remove cpuhp state
2c2905b5 BACKPORT: scsi: ufs: core: Fix the polling implementation
8a4dff33 UPSTREAM: block: mq-deadline: Fix dd_finish_request() for zoned devices
d85e7fbc BACKPORT: arm64: mm: kfence: only handle translation faults
dc0148ee UPSTREAM: mm/damon/dbgfs: check if rm_contexts input is for a real context
a807402d UPSTREAM: mm/shmem: use page_mapping() to detect page cache for uffd continue
adafd349 UPSTREAM: f2fs: fix gc mode when gc_urgent_high_remaining is 1
336c2f58 BACKPORT: mm: multi-gen LRU: move lru_gen_add_mm() out of IRQ-off region
5c311ab6 UPSTREAM: KVM: arm64: Use correct accessor to parse stage-1 PTEs
69eba539 FROMLIST: sched/wait: Fix a kthread_park race with wait_woken()
5c8f4dcb UPSTREAM: firmware: tegra: Fix error application of sizeof() to pointer
14d0c7d2 BACKPORT: drm/amd/display: Allocate structs needed by dcn_bw_calc_rq_dlg_ttu in pipe_ctx
2e0d2973 BACKPORT: drm/amd/display: Pass display_pipe_params_st as const in DML
5e920737 UPSTREAM: ext4: fix kernel BUG in 'ext4_write_inline_data_end()'
e0f4a32a ANDROID: fuse-bpf: Run bpf with migration disabled
59958dee ANDROID: incremental fs: Evict inodes before freeing mount data
8233931b ANDROID: fuse: fix struct path zero initialization
f96eed0e ANDROID: MGLRU: Avoid reactivation of anon pages on swap full
a79f9851 ANDROID: fuse-bpf: Correctly put backing files
ad92c375 ANDROID: fuse: Support errors from fuse daemon in canonical path
e56c90db ANDROID: Update ABI symbols
0dd9f48b UPSTREAM: mm: memcontrol: set the correct memcg swappiness restriction
74a32e39 UPSTREAM: media: rc: Fix use-after-free bugs caused by ene_tx_irqsim()
347e7b0c ANDROID: Fix kernelci break: eventfd_signal_mask redefined
afb74ec9 ANDROID: GKI: rockchip: add symbols for dw-dp and skw wifi.
7949efba ANDROID: ABI: Update db845c symbol list for drm_bridge
33b3c95a ANDROID: Export kthread_set_per_cpu
3a0e9d7e ANDROID: dm-default-key: update for blk_crypto_evict_key() returning void
f38706b8 BACKPORT: FROMGIT: blk-crypto: make blk_crypto_evict_key() more robust
ee0c7832 BACKPORT: FROMGIT: blk-crypto: make blk_crypto_evict_key() return void
e7c0e107 BACKPORT: FROMGIT: blk-mq: release crypto keyslot before reporting I/O complete
d392e4fc ANDROID: gki_defconfig: enable CONFIG_CRYPTO_GHASH_ARM64_CE
397e2499 UPSTREAM: hid: bigben_probe(): validate report count
610cbca4 UPSTREAM: HID: bigben: use spinlock to safely schedule workers
70c84a45 UPSTREAM: HID: bigben_worker() remove unneeded check on report_field
89174d3e UPSTREAM: HID: bigben: use spinlock to protect concurrent accesses
2ce4ee5f BACKPORT: USB: gadget: Fix use-after-free during usb config switch
5748fe6d ANDROID: sched/fair: Remove duplicated trace function
b496bf67 ANDROID: fix ABI by undoing atomic64_t -> u64 type conversion
a1ef5382 UPSTREAM: net: retrieve netns cookie via getsocketopt
5bd97c87 UPSTREAM: net: initialize net->net_cookie at netns setup

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