aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2017-11-28 16:11:29 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2017-12-05 07:51:07 +0100
commitedfb8d8fcb94a75b2e61c63549d4a5f6474ad3d2 (patch)
treee298e9df9335403ef5dda56c7cd64b1914abbbdf /arch/s390/include
parentMerge tag 'docs-4.15-fixes' of git://git.lwn.net/linux (diff)
downloadlinux-dev-edfb8d8fcb94a75b2e61c63549d4a5f6474ad3d2.tar.xz
linux-dev-edfb8d8fcb94a75b2e61c63549d4a5f6474ad3d2.zip
s390/virtio: add BSD license to virtio-ccw
The original intent of the virtio header relicensing from 2008 was to make sure anyone can implement compatible devices/drivers. The virtio-ccw was omitted by mistake. We have an ack from the only contributor as well as the maintainer from IBM, so it's not too late to fix that. Make it dual-licensed with GPLv2, as the whole kernel is GPL2. Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Acked-by: Cornelia Huck <cohuck@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include')
-rw-r--r--arch/s390/include/uapi/asm/virtio-ccw.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/uapi/asm/virtio-ccw.h b/arch/s390/include/uapi/asm/virtio-ccw.h
index 3a77833c74dc..2b605f7e8483 100644
--- a/arch/s390/include/uapi/asm/virtio-ccw.h
+++ b/arch/s390/include/uapi/asm/virtio-ccw.h
@@ -1,4 +1,4 @@
-/* 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.
*