diff options
| author | Linus Torvalds | 2017-11-30 17:13:36 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2017-11-30 17:13:36 +0100 |
| commit | 22985bf59b0228769dc568d6401ed2090e2eed27 (patch) | |
| tree | 5c6657f0f09516a7751b14d138549be51ca6fe57 /arch/s390/kernel/sthyi.c | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | s390/gs: add compat regset for the guarded storage broadcast control block (diff) | |
| download | kernel-qcow2-linux-22985bf59b0228769dc568d6401ed2090e2eed27.tar.gz kernel-qcow2-linux-22985bf59b0228769dc568d6401ed2090e2eed27.tar.xz kernel-qcow2-linux-22985bf59b0228769dc568d6401ed2090e2eed27.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
- SPDX identifiers are added to more of the s390 specific files.
- The ELF_ET_DYN_BASE base patch from Kees is reverted, with the change
some old 31-bit programs crash.
- Bug fixes and cleanups.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (29 commits)
s390/gs: add compat regset for the guarded storage broadcast control block
s390: revert ELF_ET_DYN_BASE base changes
s390: Remove redundant license text
s390: crypto: Remove redundant license text
s390: include: Remove redundant license text
s390: kernel: Remove redundant license text
s390: add SPDX identifiers to the remaining files
s390: appldata: add SPDX identifiers to the remaining files
s390: pci: add SPDX identifiers to the remaining files
s390: mm: add SPDX identifiers to the remaining files
s390: crypto: add SPDX identifiers to the remaining files
s390: kernel: add SPDX identifiers to the remaining files
s390: sthyi: add SPDX identifiers to the remaining files
s390: drivers: Remove redundant license text
s390: crypto: Remove redundant license text
s390: virtio: add SPDX identifiers to the remaining files
s390: scsi: zfcp_aux: add SPDX identifier
s390: net: add SPDX identifiers to the remaining files
s390: char: add SPDX identifiers to the remaining files
s390: cio: add SPDX identifiers to the remaining files
...
Diffstat (limited to 'arch/s390/kernel/sthyi.c')
| -rw-r--r-- | arch/s390/kernel/sthyi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/s390/kernel/sthyi.c b/arch/s390/kernel/sthyi.c index 12981e197f01..80b862e9c53c 100644 --- a/arch/s390/kernel/sthyi.c +++ b/arch/s390/kernel/sthyi.c @@ -1,10 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * store hypervisor information instruction emulation functions. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License (version 2 only) - * as published by the Free Software Foundation. - * * Copyright IBM Corp. 2016 * Author(s): Janosch Frank <frankja@linux.vnet.ibm.com> */ |