Merge branch 'android12-5.10' into `android12-5.10-lts`
Sync up with android12-5.10 for the following commits: 2a2327c4 FROMLIST: power_supply: Use of-thermal cdev registration API b90fe5ef FROMLIST: power_supply: Register cooling device outside of probe fc64efcd Revert "UPSTREAM: tracefs: Have tracefs directories not set OTH permission bits by default" 1eb3049d FROMGIT: usb: dwc3: gadget: Prevent core from processing stale TRBs ee1e2de7 UPSTREAM: cgroup-v1: Require capabilities to set release_agent 7e6f112b FROMGIT: f2fs: move f2fs to use reader-unfair rwsems 23686f5e UPSTREAM: f2fs: do not bother checkpoint by f2fs_get_node_info fa055ddf BACKPORT: f2fs: avoid down_write on nat_tree_lock during checkpoint c8701aa0 ANDROID: GKI: enable RCU_BOOST c34fa06f FROMLIST: rcu: Don't deboost before reporting expedited quiescent state 3a49d3b6 FROMGIT: usb: f_fs: Fix use-after-free for epfile 250abe08 UPSTREAM: usb: gadget: f_fs: Clear ffs_eventfd in ffs_data_clear. d449d91b ANDROID: update new gki symbol b2fcb7b6 ANDROID: abi: qcom: Add dma_{alloc,free}_noncoherent 5d79e492 UPSTREAM: binder: fix async_free_space accounting for empty parcels 6aa9e78d FROMGIT: rcu: Allow expedited RCU grace periods on incoming CPUs 2f61ec09 ANDROID: abi_gki_aarch64_qcom: Add iommu_setup_dma_ops restricted vh 6a9ff8fa ANDROID: iommu: Add restricted vendor hook 2aba795b FROMLIST: arm64: cpufeature: List early Cortex-A510 parts as having broken dbm 2861bbc5 FROMLIST: arm64: Add Cortex-A510 CPU part definition b0d13db7 FROMGIT: printk: ringbuffer: Improve prb_next_seq() performance 4b1862e4 ANDROID: incremental-fs: fix GPF in pending_reads_dispatch_ioctl 445019bb UPSTREAM: bpf: Fix integer overflow in argument calculation for bpf_map_area_alloc 032a6762 UPSTREAM: tee: handle lookup of shm with reference count 0 d461f54b ANDROID: Incremental-fs: Doc: correct a sysfs path in incfs.rst 1bfc9c16 ANDROID: selftests: fix incfs_test fd4c6594 ANDROID: incremental-fs: fix mount_fs issue a512242e BACKPORT: arm64: errata: Add workaround for TSB flush failures e4805124 UPSTREAM: arm64: Add Neoverse-N2, Cortex-A710 CPU part definition dd3256d4 UPSTREAM: coresight: trbe: Defer the probe on offline CPUs 71aebf87 UPSTREAM: coresight: etm4x: Use Trace Filtering controls dynamically 2bb8b3c9 BACKPORT: coresight: etm4x: Save restore TRFCR_EL1 79b64fa7 UPSTREAM: coresight: tmc-etr: Speed up for bounce buffer in flat mode aee6af70 UPSTREAM: coresight: tmc-etr: Add barrier after updating AUX ring buffer a0009ade Revert half of "ANDROID: cpu/hotplug: create vendor hook for cpu_up/cpu_down" a863cef3 Revert half of "ANDROID: arm64: add vendor hooks for bti and pauth fault" 9f58bcd6 Revert half of "ANDROID: vendor_hooks: Add param for android_vh_cpu_up/down" 4b339604 Revert "ANDROID: vendor_hooks: Add a hook for task tagging" d8fe0b1f Revert "ANDROID: GKI: net: add vendor hooks for 'struct nf_conn' lifecycle" 92ab2aec Revert "ANDROID: GKI: net: add vendor hooks for 'struct sock' lifecycle" b3e6d6ee Revert "ANDROID: vendor_hooks: add hook and OEM data for slab shrink" e09000ee Revert half of "ANDROID: vendor_hooks: Add hooks for memory when debug" 3f305a91 Revert half of "ANDROID: gic-v3: Add vendor hook to GIC v3" 3b4ca926 Merge tag 'android12-5.10.81_r00' into android12-5.10 bdc732d1 UPSTREAM: tracefs: Set all files to the same group ownership as the mount option 8455746a UPSTREAM: tracefs: Have new files inherit the ownership of their parent 9c63be2a UPSTREAM: tracefs: Have tracefs directories not set OTH permission bits by default 64095600 Revert "ANDROID: vendor_hooks: Add hooks to recognize special worker thread." 78870910 Revert "ANDROID: sysrq: add vendor hook for sysrq crash information" 63e7148b Revert "ANDROID: user: Add vendor hook to user for GKI purpose" 18975040 Revert portions of "ANDROID: sched: Add vendor hooks for sched." 96c08d92 Revert portions of "ANDROID: vendor_hooks: Add hooks for scheduler" a32e8988 UPSTREAM: vfs: fs_context: fix up param length parsing in legacy_parse_param New functions/variables are now being tracked as well, that came from the android12-5.10 branch: Leaf changes summary: 5 artifacts changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 4 Added functions Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 1 Added variable 4 Added functions: [A] 'function int __traceiter_android_rvh_iommu_setup_dma_ops(void*, device*, u64, u64)' [A] 'function void* dma_alloc_noncoherent(device*, size_t, dma_addr_t*, dma_data_direction, gfp_t)' [A] 'function void dma_free_noncoherent(device*, size_t, void*, dma_addr_t, dma_data_direction)' [A] 'function void static_key_enable_cpuslocked(static_key*)' 1 Added variable: [A] 'tracepoint __tracepoint_android_rvh_iommu_setup_dma_ops' Signed-off-by:Greg Kroah-Hartman <gregkh@google.com> Change-Id: I7a5a82681cc94f6b3dcd17e159da8976be0bcb78
Loading
Please sign in to comment