Merge branch 'for-3.11-fixes' into for-next

diff --cc kernel/cpuset.c
index 72a0383f382fa75e5d2d64f4d34fba4f2289873d,010a0083c0ae4cfa222e2d51f2e951893bac28c4..235ad7b3ff1c674fb114e3fb058fc1261dc7df3a
--- 1/kernel/cpuset.c
--- 2/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@@ -1594,16 -1604,17 +1594,18 @@@ typedef enum 
        FILE_SPREAD_SLAB,
  } cpuset_filetype_t;
  
 -static int cpuset_write_u64(struct cgroup *cgrp, struct cftype *cft, u64 val)
 +static int cpuset_write_u64(struct cgroup_subsys_state *css, struct cftype *cft,
 +                          u64 val)
  {
 -      struct cpuset *cs = cgroup_cs(cgrp);
 +      struct cpuset *cs = css_cs(css);
        cpuset_filetype_t type = cft->private;
-       int retval = -ENODEV;
+       int retval = 0;
  
        mutex_lock(&cpuset_mutex);
-       if (!is_cpuset_online(cs))
+       if (!is_cpuset_online(cs)) {
+               retval = -ENODEV;
                goto out_unlock;
+       }
  
        switch (type) {
        case FILE_CPU_EXCLUSIVE: