linux-next: manual merge of the block tree with the cgroup tree
From: Stephen Rothwell
Date: Tue Jun 18 2013 - 23:47:50 EST
Today's linux-next merge of the block tree got a conflict in
include/linux/cgroup.h between commit f63674fd0d6a ("cgroup: update
sane_behavior documentation") from the cgroup tree and commit
9138125beabb ("blk-throttle: implement proper hierarchy support") from
the block tree.
I fixed it up (see below) and can carry the fix as necessary (no action
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc include/linux/cgroup.h
@@@ -261,23 -269,15 +261,25 @@@ enum
* - Remount is disallowed.
+ * - "tasks" is removed. Everything should be at process
+ * granularity. Use "cgroup.procs" instead.
+ * - "release_agent" and "notify_on_release" are removed.
+ * Replacement notification mechanism will be implemented.
+ * - rename(2) is disallowed.
+ * - cpuset: tasks will be kept in empty cpusets when hotplug happens
+ * and take masks of ancestors with non-empty cpus/mems, instead of
+ * being moved to an ancestor.
+ * - cpuset: a task can be moved into an empty cpuset, and again it
+ * takes masks of ancestors.
* - memcg: use_hierarchy is on by default and the cgroup file for
* the flag is not created.
+ * - blkcg: blk-throttle becomes properly hierarchical.
- * The followings are planned changes.
- * - release_agent will be disallowed once replacement notification
- * mechanism is implemented.
CGRP_ROOT_SANE_BEHAVIOR = (1 << 0),
Description: PGP signature