The following changes since commit 4de65c5830233e7a4adf2e679510089ec4e210c7: Merge tag 'livepatching-for-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching (2022-10-10 11:36:19 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/ tags/cgroup-for-6.1-rc1-fixes for you to fetch changes up to 79a818b5087393d5a4cb356d4545d02f55bf1a2f: blkcg: Update MAINTAINERS entry (2022-10-17 09:27:18 -1000) ---------------------------------------------------------------- cgroup fixes for v6.1-rc1 * Fix a recent regression where a sleeping kernfs function is called with css_set_lock (spinlock) held. * Revert the commit to enable cgroup1 support for cgroup_get_from_fd/file(). Multiple users assume that the lookup only works for cgroup2 and breaks when fed a cgroup1 file. Instead, introduce a separate set of functions to lookup both v1 and v2 and use them where the user explicitly wants to support both versions. * Compat update for tools/perf/util/bpf_skel/bperf_cgroup.bpf.c. * Add Josef Bacik as a blkcg maintainer. ---------------------------------------------------------------- Michal Koutný (1): cgroup: Reorganize css_set_lock and kernfs path processing Namhyung Kim (1): perf stat: Support old kernels for bperf cgroup counting Tejun Heo (2): Revert "cgroup: enable cgroup_get_from_file() on cgroup1" blkcg: Update MAINTAINERS entry Yosry Ahmed (3): cgroup: add cgroup_v1v2_get_from_[fd/file]() bpf: cgroup_iter: support cgroup1 using cgroup fd mm: cgroup: fix comments for get from fd/file helpers MAINTAINERS | 2 + include/linux/cgroup.h | 1 + kernel/bpf/cgroup_iter.c | 2 +- kernel/cgroup/cgroup.c | 99 +++++++++++++++++++++++------ tools/perf/util/bpf_skel/bperf_cgroup.bpf.c | 29 ++++++++- 5 files changed, 111 insertions(+), 22 deletions(-)