diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-11 13:13:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-11 13:13:22 -0700 |
| commit | 045395d86acd02062b067bd325d4880391f2ce02 (patch) | |
| tree | 655d369d2de6cc94f61386659be300367f7760cd /kernel/cgroup | |
| parent | 1a1e09890cf8fb2e088dab4e4f332cfb85d9b47f (diff) | |
| parent | 3ab67a9ce82ff22447b1dad53b49a91d1abbf1ff (diff) | |
| download | linux-045395d86acd02062b067bd325d4880391f2ce02.tar.gz linux-045395d86acd02062b067bd325d4880391f2ce02.tar.bz2 linux-045395d86acd02062b067bd325d4880391f2ce02.zip | |
Merge tag 'cgroup-for-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo:
"A quiet cycle. One trivial doc update patch. Two patches to drop the
now defunct memory_spread_slab feature from cgroup1 cpuset"
* tag 'cgroup-for-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup/cpuset: Mark memory_spread_slab as obsolete
cgroup/cpuset: Remove cpuset_do_slab_mem_spread()
docs: cgroup-v1: add missing code-block tags
Diffstat (limited to 'kernel/cgroup')
| -rw-r--r-- | kernel/cgroup/cpuset.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 927bef3a598a..4237c8748715 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -3897,6 +3897,7 @@ static struct cftype legacy_files[] = { }, { + /* obsolete, may be removed in the future */ .name = "memory_spread_slab", .read_u64 = cpuset_read_u64, .write_u64 = cpuset_write_u64, |