Merge remote-tracking branch 'block/for-next'

Conflicts:
	include/linux/cgroup.h

diff --cc MAINTAINERS
Simple merge

diff --cc include/linux/cgroup.h
index 448591801cb5020151fe81892d1d358735a2fd1d,09f1a1408ae07bbc38da0161d2592e050f0bbe4b..cda1bb61de9fce908bb8134ef09389c608294363
--- 1/include/linux/cgroup.h
--- 2/include/linux/cgroup.h
+++ b/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.
 -       *
 -       * The followings are planned changes.
 -       *
 -       * - release_agent will be disallowed once replacement notification
 -       *   mechanism is implemented.
+        *
+        * - blkcg: blk-throttle becomes properly hierarchical.
         */
        CGRP_ROOT_SANE_BEHAVIOR = (1 << 0),