Merge branch 'linus' into locking/core, to resolve conflict

Merge branch 'linus' into locking/core, to resolve conflict

Conflicts:
	arch/arm/include/asm/percpu.h

As Stephen Rothwell noted, there's a conflict between this commit
in locking/core:

  44b228b2388c ("lockdep: Change hardirq{s_enabled,_context} to per-cpu variables")

and this fresh upstream commit:

  1975d86d9862 ("ARM: percpu.h: fix build error")

44b228b2388c is a simpler solution to the dependency problem and doesn't
further increase header hell - so this conflict resolution effectively
reverts 1975d86d9862 and uses the 44b228b2388c solution.

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