diff options
| author | Ingo Molnar <[email protected]> | 2020-07-25 08:14:55 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2020-07-26 16:26:25 +0000 |
| commit | f87032aec41e0b00ae5fa9103eb8e7b2d1f8416b (patch) | |
| tree | a97529fda2762270084c18958c269c3e2633463d /drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | |
| parent | Merge branch 'core/entry' into x86/entry (diff) | |
| parent | x86/entry: Fix NMI vs IRQ state tracking (diff) | |
| download | kernel-f87032aec41e0b00ae5fa9103eb8e7b2d1f8416b.tar.gz kernel-f87032aec41e0b00ae5fa9103eb8e7b2d1f8416b.zip | |
Merge branch 'locking/nmi' into x86/entry
Resolve conflicts with ongoing lockdep work that fixed the NMI entry code.
Conflicts:
arch/x86/entry/common.c
arch/x86/include/asm/idtentry.h
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c')
0 files changed, 0 insertions, 0 deletions