diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-08 10:10:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-08 10:10:17 -0800 |
| commit | c6b3e9693f8a32ba3b07e2f2723886ea2aff4e94 (patch) | |
| tree | 839957e357a247d18030322d936322e2a13decfe /arch/s390/kernel/vdso64/note.S | |
| parent | 6e7e7f4ddc742c390f289b98fe1e53e7487facd7 (diff) | |
| parent | e779498df587dd2189b30fe5b9245aefab870eb8 (diff) | |
| download | linux-c6b3e9693f8a32ba3b07e2f2723886ea2aff4e94.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
- three more patches in regard to the SPDX license tags. The missing
tags for the files in arch/s390/kvm will be merged via the KVM tree.
With that all s390 related files should have their SPDX tags.
- a patch to get rid of 'struct timespec' in the DASD driver.
- bug fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: fix compat system call table
s390/mm: fix off-by-one bug in 5-level page table handling
s390: Remove redudant license text
s390: add a few more SPDX identifiers
s390/dasd: prevent prefix I/O error
s390: always save and restore all registers on context switch
s390/dasd: remove 'struct timespec' usage
s390/qdio: restrict target-full handling to IQDIO
s390/qdio: consider ERROR buffers for inbound-full condition
s390/virtio: add BSD license to virtio-ccw
Diffstat (limited to 'arch/s390/kernel/vdso64/note.S')
| -rw-r--r-- | arch/s390/kernel/vdso64/note.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/vdso64/note.S b/arch/s390/kernel/vdso64/note.S index 79a071e4357e..db19d0680a0a 100644 --- a/arch/s390/kernel/vdso64/note.S +++ b/arch/s390/kernel/vdso64/note.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * This supplies .note.* sections to go into the PT_NOTE inside the vDSO text. * Here we can supply some information useful to userland. |