diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-01-23 13:10:24 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-01-23 13:10:24 +0000 |
| commit | 238e2d93c9ddc9bc6b5392289bed38a4ebff004d (patch) | |
| tree | 5e52bbbc7d7cd614a582d5851d567762e908ed03 /include | |
| parent | 52483b067cce4a88ffbf8fbeea26de7549d2ad23 (diff) | |
| parent | 9f0d13f4f1de3cf9b70435cc4e87a301ee12471f (diff) | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180122' into staging
Various fixes/improvements, and support for the new 81/82
facility bits.
# gpg: Signature made Mon 22 Jan 2018 11:54:46 GMT
# gpg: using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg: aka "Cornelia Huck <cohuck@kernel.org>"
# gpg: aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20180122:
s390x/kvm: provide stfle.81
s390x/kvm: Handle bpb feature
linux-headers: update
s390x/tcg: fixup TEST PROTECTION
s390x: fix storage attributes migration for non-small guests
hw/s390x: Replace fprintf(stderr, "*\n" with qemu_log_mask()
s390x/sclp: fix missing be conversion
s390x/tcg: implement TEST PROTECTION
s390x/sclp: fixup highest CPU address
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/standard-headers/asm-s390/virtio-ccw.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/standard-headers/asm-s390/virtio-ccw.h b/include/standard-headers/asm-s390/virtio-ccw.h index 967aad3901..2b605f7e84 100644 --- a/include/standard-headers/asm-s390/virtio-ccw.h +++ b/include/standard-headers/asm-s390/virtio-ccw.h @@ -1,13 +1,9 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ /* * Definitions for virtio-ccw devices. * * Copyright IBM Corp. 2013 * - * 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. - * * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com> */ #ifndef __KVM_VIRTIO_CCW_H |