projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'stable/for-linus-3.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
um
/
defconfig
diff --git
a/arch/um/defconfig
b/arch/um/defconfig
index fec0d5d27460ebaca25e49a5d0dec5fe9723682f..08107a795062c55b0e9633bdd0b2da02351e96c4 100644
(file)
--- a/
arch/um/defconfig
+++ b/
arch/um/defconfig
@@
-163,7
+163,7
@@
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
# CONFIG_CFS_BANDWIDTH is not set
# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_BLK_CGROUP=
m
+CONFIG_BLK_CGROUP=
y
# CONFIG_DEBUG_BLK_CGROUP is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_NAMESPACES=y