git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'slab-for-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka...
[sfrench/cifs-2.6.git]
/
init
/
Kconfig
diff --git
a/init/Kconfig
b/init/Kconfig
index 04acc3f80538c4df1cf0ec4c3c7a8aeb56d3e1de..c9ec6e8e4d5d5d77c6002a4f80722a440c4d6a7f 100644
(file)
--- a/
init/Kconfig
+++ b/
init/Kconfig
@@
-945,7
+945,7
@@
config MEMCG
config MEMCG_KMEM
bool
- depends on MEMCG
&& !SLOB
+ depends on MEMCG
default y
config BLK_CGROUP