Merge branch 'sched/core'

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

diff --cc kernel/locking/locktorture.c
index dbafeac18e4d58b2da77988ff939e8db2e860d0e,23343be46e91c16068a1131cc893acb40ae5b5d2..0955b885d0dc8eb5fe54aeeebe08c0eee6bd9cb7
--- 1/kernel/locking/locktorture.c
--- 2/kernel/locking/locktorture.c
+++ b/kernel/locking/locktorture.c
@@@ -216,11 -216,10 +216,11 @@@ static int lock_torture_writer(void *ar
        static DEFINE_TORTURE_RANDOM(rand);
  
        VERBOSE_TOROUT_STRING("lock_torture_writer task started");
-       set_user_nice(current, 19);
+       set_user_nice(current, MAX_NICE);
  
        do {
 -              schedule_timeout_uninterruptible(1);
 +              if ((torture_random(&rand) & 0xfffff) == 0)
 +                      schedule_timeout_uninterruptible(1);
                cur_ops->writelock();
                if (WARN_ON_ONCE(lock_is_write_held))
                        lwsp->n_write_lock_fail++;

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/cpupri.c
Simple merge