diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-09-10 17:51:17 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-09-10 17:51:17 +0300 |
| commit | 8146856b0a2693d5f7334f720c9b39a987f7571d (patch) | |
| tree | e51fd6831162103d32e8a2ad83bf4077768a51b2 /arch/nds32/include/uapi/asm/ptrace.h | |
| parent | 16cfacc8085782dab8e365979356ce1ca87fd6cc (diff) | |
| parent | ff42df49e75f053a8a6b4c2533100cdcc23afe69 (diff) | |
| download | linux-8146856b0a2693d5f7334f720c9b39a987f7571d.tar.xz | |
Merge tag 'kvm-ppc-next-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD
PPC KVM update for 5.4
- Some prep for extending the uses of the rmap array
- Various minor fixes
- Commits from the powerpc topic/ppc-kvm branch, which fix a problem
with interrupts arriving after free_irq, causing host hangs and crashes.
Diffstat (limited to 'arch/nds32/include/uapi/asm/ptrace.h')
| -rw-r--r-- | arch/nds32/include/uapi/asm/ptrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/nds32/include/uapi/asm/ptrace.h b/arch/nds32/include/uapi/asm/ptrace.h index 1a6e01c00e6f..d76217c7c010 100644 --- a/arch/nds32/include/uapi/asm/ptrace.h +++ b/arch/nds32/include/uapi/asm/ptrace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2005-2017 Andes Technology Corporation #ifndef __UAPI_ASM_NDS32_PTRACE_H |