Merge tag 'v4.0-rc1' into locking/core, to refresh the tree before merging new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined kernel/futex.c
index 1f6d646eee4aa30dbef8ef77bd70dca3124e387c,2a5e3830e953b72cca4aeac4ec537e276f0f355b..2579e407ff67d039106207f78a466f824e515db6
--- 1/kernel/futex.c
--- 2/kernel/futex.c
+++ b/kernel/futex.c
@@@ -900,7 -900,7 +900,7 @@@ static int attach_to_pi_owner(u32 uval
        if (!p)
                return -ESRCH;
  
 -      if (!p->mm) {
 +      if (unlikely(p->flags & PF_KTHREAD)) {
                put_task_struct(p);
                return -EPERM;
        }
@@@ -2217,7 -2217,7 +2217,7 @@@ retry
        if (!abs_time)
                goto out;
  
-       restart = &current_thread_info()->restart_block;
+       restart = &current->restart_block;
        restart->fn = futex_wait_restart;
        restart->futex.uaddr = uaddr;
        restart->futex.val = val;