Merge branch 'linus' into sched-devel

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/cpuset.c
Simple merge

diff --cc kernel/sched.c
index 07d5472dee99b3791a811fa8cb8ffbc3a496479f,eaf6751e7612cbc5167865c8c1e4e929ff32ca5a..554de40098037c8a115406c07036cfd751785cc3
--- 1/kernel/sched.c
--- 2/kernel/sched.c
+++ b/kernel/sched.c
@@@ -310,12 -307,15 +310,15 @@@ static DEFINE_SPINLOCK(task_group_lock)
  #ifdef CONFIG_FAIR_GROUP_SCHED
  #ifdef CONFIG_USER_SCHED
  # define INIT_TASK_GROUP_LOAD (2*NICE_0_LOAD)
 -#else
 +#else /* !CONFIG_USER_SCHED */
  # define INIT_TASK_GROUP_LOAD NICE_0_LOAD
 -#endif
 +#endif /* CONFIG_USER_SCHED */
  
  /*
-  * A weight of 0, 1 or ULONG_MAX can cause arithmetics problems.
+  * A weight of 0 or 1 can cause arithmetics problems.
+  * A weight of a cfs_rq is the sum of weights of which entities
+  * are queued on this cfs_rq, so a weight of a entity should not be
+  * too large, so as the shares value of a task group.
   * (The default weight is 1024 - so there's no practical
   *  limitation from this.)
   */