Ingo Molnar 28cff52eae 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:

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

and this fresh upstream commit:

  aa54ea903abb ("ARM: percpu.h: fix build error")

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

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2020-07-31 12:16:09 +02:00
..
2020-07-05 12:23:49 -07:00
2020-06-11 15:14:54 +02:00
2020-03-30 19:14:28 -07:00
2020-06-11 15:15:23 +02:00
2020-01-09 14:40:03 +01:00
2020-06-11 15:15:23 +02:00
2020-06-11 20:02:46 +02:00
2020-06-11 15:15:26 +02:00
2020-02-26 15:21:22 +01:00
2019-11-12 16:21:15 +01:00
2019-11-12 16:21:15 +01:00
2020-07-10 12:00:01 +02:00
2019-11-28 11:16:43 -08:00
2019-06-24 19:19:24 +02:00
2020-06-11 15:54:31 -07:00
2020-06-02 10:59:12 -07:00
2020-03-21 16:03:25 +01:00
2020-06-11 15:54:31 -07:00
2020-07-25 21:49:36 +02:00
2020-03-30 19:55:39 -07:00
2020-02-16 20:58:06 +01:00
2020-04-15 11:13:12 +02:00