diff --git a/[refs] b/[refs]
index 5e1afdb00760..250da228b841 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a84ccab132370a07c7ca0c6df8c96bbd16306c9a
+refs/heads/master: 2cad4c1276707ae06f40482bd91af513d23f5a6d
diff --git a/trunk/arch/um/defconfig b/trunk/arch/um/defconfig
index 7823ab12e6a4..6d07609362bd 100644
--- a/trunk/arch/um/defconfig
+++ b/trunk/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