Merge branch into tip/master: 'locking/urgent'

 # New commits in locking/urgent:
    495f53d5 ("locking/lockdep: Decrease nr_unused_locks if lock unused in zap_class()")
    61c39d8c ("lockdep: Fix wait context check on softirq for PREEMPT_RT")
    0e1ff67d ("x86/split_lock: Simplify reenabling")

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