Tejun Heo 026e14a276 Merge branch 'for-6.0-fixes' into for-6.1 ... for-6.0 has the following fix for cgroup_get_from_id(). 836ac87d ("cgroup: fix cgroup_get_from_id") which conflicts with the following two commits in for-6.1. 4534dee9 ("cgroup: cgroup: Honor caller's cgroup NS when resolving cgroup id") fa7e439c ("cgroup: Homogenize cgroup_get_from_id() return value") While the resolution is straightforward, the code ends up pretty ugly afterwards. Let's pull for-6.0-fixes into for-6.1 so that the code can be fixed up there. Signed-off-by: Tejun Heo <tj@kernel.org>		2022-09-23 07:19:38 -10:00
..
cgroup-internal.h	cgroup: Use cgroup_attach_{lock,unlock}() from cgroup_attach_task_all()	2022-08-26 11:14:34 -10:00
cgroup-v1.c	cgroup: Use cgroup_attach_{lock,unlock}() from cgroup_attach_task_all()	2022-08-26 11:14:34 -10:00
cgroup.c	Merge branch 'for-6.0-fixes' into for-6.1	2022-09-23 07:19:38 -10:00
cpuset.c	cgroup/cpuset: remove unreachable code	2022-09-07 05:30:29 -10:00
debug.c	kernel: cgroup: fix misuse of %x	2019-05-06 08:47:48 -07:00
freezer.c	cgroup: cleanup comments	2022-03-13 19:19:27 -10:00
legacy_freezer.c	cgroup: rename freezer.c into legacy_freezer.c	2019-04-19 11:26:48 -07:00
Makefile	cgroup: Add misc cgroup controller	2021-04-04 13:34:46 -04:00
misc.c	misc_cgroup: remove error log to avoid log flood	2021-09-20 07:35:38 -10:00
namespace.c	memcg: enable accounting for new namesapces and struct nsproxy	2021-09-03 09:58:12 -07:00
pids.c	cgroup: add pids.peak interface for pids controller	2022-09-04 09:26:51 -10:00
rdma.c	cgroup: fix spelling mistakes	2021-05-24 12:45:26 -04:00
rstat.c	sched/core: add forced idle accounting for cgroups	2022-07-04 09:23:07 +02:00