diff options
| author | Ingo Molnar <[email protected]> | 2020-07-31 09:58:05 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2020-07-31 10:16:09 +0000 |
| commit | 28cff52eaeb5c43144d0c730080aff0d6bc1e5d5 (patch) | |
| tree | a55a41b99503a5c96314908b9f30db37e301d64d /drivers/fpga/fpga-bridge.c | |
| parent | kcsan: Improve IRQ state trace reporting (diff) | |
| parent | Merge tag 'drm-fixes-2020-07-31' of git://anongit.freedesktop.org/drm/drm (diff) | |
| download | kernel-28cff52eaeb5c43144d0c730080aff0d6bc1e5d5.tar.gz kernel-28cff52eaeb5c43144d0c730080aff0d6bc1e5d5.zip | |
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 <[email protected]>
Diffstat (limited to 'drivers/fpga/fpga-bridge.c')
0 files changed, 0 insertions, 0 deletions