Files
android_kernel_xiaomi_sm8450/arch/parisc/include/asm
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:

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

and this fresh upstream commit:

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

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

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2020-07-31 12:16:09 +02:00
..
2019-01-04 13:13:46 -08:00
2019-09-08 15:37:04 +02:00
2019-05-03 23:47:41 +02:00
2020-06-09 09:39:13 -07:00
2019-05-03 23:47:38 +02:00
2019-07-21 11:01:55 +02:00
2019-02-21 20:37:12 +01:00
2019-09-08 15:19:58 +02:00
2018-10-31 08:54:12 -07:00
2019-06-25 14:52:26 +02:00
2019-07-16 19:23:24 -07:00
2019-05-03 23:47:41 +02:00
2017-11-17 15:27:22 +01:00
2019-07-17 23:11:28 +02:00