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

 # New commits in locking/core:
    18caaedaf4c3 ("locking/lockdep: Slightly reorder 'struct lock_class' to save some memory")
    28a9466d75a8 ("MAINTAINERS: Add include/linux/lockdep*.h")
    e4ab322fbaaa ("cleanup: Add conditional guard support")

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