The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 3840cbe24cf060ea05a585ca497814609f5d47d1 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024100745-barometer-saffron-c873@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 3840cbe24cf0 ("sched: psi: fix bogus pressure spikes from aggregation race") ddae0ca2a8fe ("sched: Move psi_account_irqtime() out of update_rq_clock_task() hotpath") 0c2924079f5a ("sched/psi: Bail out early from irq time accounting") a3b2aeac9d15 ("delayacct: track delays from IRQ/SOFTIRQ") eca7de7cdc38 ("delayacct: improve the average delay precision of getdelay tool to microsecond") 6ab587e8e8b4 ("docs/zh_CN: Update the translation of delay-accounting to 6.1-rc8") 34f26a15611a ("sched/psi: Per-cgroup PSI accounting disable/re-enable interface") dc86aba751e2 ("sched/psi: Cache parent psi_group to speed up group iteration") 52b1364ba0b1 ("sched/psi: Add PSI_IRQ to track IRQ/SOFTIRQ pressure") 71dbdde7914d ("sched/psi: Remove NR_ONCPU task accounting") 65176f59a18d ("sched/psi: Optimize task switch inside shared cgroups again") d79ddb069c52 ("sched/psi: Move private helpers to sched/stats.h") c530a3c716b9 ("sched/psi: Fix periodic aggregation shut off") 5f69a6577bc3 ("psi: dont alloc memory for psi by default") 662ce1dc9caf ("delayacct: track delays from write-protect copy") 6f664045c868 ("Merge tag 'mm-nonmm-stable-2022-05-26' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
