Skip to contentSkip to conversation

s390/virtio: mark headers as BSD licensed

PATCH Superseded Michael S. Tsirkin 3 participants 5 messages Nov 8, 2017

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390/virtio: mark headers as BSD licensed

Virtio UAPI headers aren't just for UAPI, it's for guests/hypervisors as well. The s390 ones need to be BSD as well.

Fixes e2be04c7f995 ("License cleanup: add SPDX license identifier to uapi header files with a license")
Cc Greg Kroah-Hartman <[email protected]>

---

Christian, I would appreciate your ack if you agree.

 arch/s390/include/uapi/asm/kvm_virtio.h | 26 ++++++++++++++++++++++-
 arch/s390/include/uapi/asm/virtio-ccw.h | 37 ++++++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)
arch/s390/include/uapi/asm/kvm_virtio.h +25 -1
index 7328367..1773693 100644
@@ -1,4 +1,28 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/* This header is BSD licensed so anyone can use the definitions to implement
+ * compatible drivers/servers.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of IBM nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE. */
 /*
  * definition for virtio for kvm on s390
  *
arch/s390/include/uapi/asm/virtio-ccw.h +36 -1
index 967aad3..8f505ec 100644
@@ -1,4 +1,39 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/* This header is BSD licensed so anyone can use the definitions to implement
+ * compatible drivers/servers.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of IBM nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE. */
+/*
+ * definition for virtio for kvm on s390
+ *
+ * Copyright IBM Corp. 2008
+ *
+ * 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): Christian Borntraeger <[email protected]>
+ */
 /*
  * Definitions for virtio-ccw devices.
  *
Signature · 1 line
MST
maintainer
#1 lore raw
Quoted 80 lines · On Wed, 8 Nov 2017 18:47:18 +0200 "Michael S. Tsirkin" <[email protected]> wrote:

Virtio UAPI headers aren't just for UAPI, it's for guests/hypervisors as well. The s390 ones need to be BSD as well.

Fixes e2be04c7f995 ("License cleanup: add SPDX license identifier to uapi header files with a license")
Cc Greg Kroah-Hartman <[email protected]>

---

Christian, I would appreciate your ack if you agree.

 arch/s390/include/uapi/asm/kvm_virtio.h | 26 ++++++++++++++++++++++-
 arch/s390/include/uapi/asm/virtio-ccw.h | 37 ++++++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)
arch/s390/include/uapi/asm/kvm_virtio.h +25 -1
index 7328367..1773693 100644
@@ -1,4 +1,28 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/* This header is BSD licensed so anyone can use the definitions to implement
+ * compatible drivers/servers.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of IBM nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE. */
 /*
  * definition for virtio for kvm on s390
  *
arch/s390/include/uapi/asm/virtio-ccw.h +26 -1
index 967aad3..8f505ec 100644
@@ -1,4 +1,39 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/* This header is BSD licensed so anyone can use the definitions to implement
+ * compatible drivers/servers.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of IBM nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE. */
+/*

arch/s390/include/uapi/asm/virtio-ccw.h line 36

Quoted 10 lines
arch/s390/include/uapi/asm/virtio-ccw.h +10 -0
+ * definition for virtio for kvm on s390
+ *
+ * Copyright IBM Corp. 2008
+ *
+ * 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): Christian Borntraeger <[email protected]>
+ */

This added notice looks wrong -- the virtio-ccw stuff was added in 2013.

Quoted 3 lines
arch/s390/include/uapi/asm/virtio-ccw.h +0 -0
 /*
  * Definitions for virtio-ccw devices.
  *
#2 lore raw
Quoted 87 lines · Cornelia Huck
Quoted 84 lines · On Wed, 8 Nov 2017 18:47:18 +0200 "Michael S. Tsirkin" <[email protected]> wrote:

Virtio UAPI headers aren't just for UAPI, it's for guests/hypervisors as well. The s390 ones need to be BSD as well.

Fixes e2be04c7f995 ("License cleanup: add SPDX license identifier to uapi header files with a license")
Cc Greg Kroah-Hartman <[email protected]>

---

Christian, I would appreciate your ack if you agree.

 arch/s390/include/uapi/asm/kvm_virtio.h | 26 ++++++++++++++++++++++-
 arch/s390/include/uapi/asm/virtio-ccw.h | 37 ++++++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)
arch/s390/include/uapi/asm/kvm_virtio.h +25 -1
index 7328367..1773693 100644
@@ -1,4 +1,28 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/* This header is BSD licensed so anyone can use the definitions to implement
+ * compatible drivers/servers.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of IBM nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE. */
 /*
  * definition for virtio for kvm on s390
  *
arch/s390/include/uapi/asm/virtio-ccw.h +30 -1
index 967aad3..8f505ec 100644
@@ -1,4 +1,39 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/* This header is BSD licensed so anyone can use the definitions to implement
+ * compatible drivers/servers.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of IBM nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE. */
+/*
+ * definition for virtio for kvm on s390
+ *
+ * Copyright IBM Corp. 2008
+ *
Quoted 8 lines

arch/s390/include/uapi/asm/virtio-ccw.h line 36

Quoted 6 lines
arch/s390/include/uapi/asm/virtio-ccw.h +6 -0
+ * 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): Christian Borntraeger <[email protected]>
+ */

This added notice looks wrong -- the virtio-ccw stuff was added in 2013.

Oops. Will send v2.

Quoted 3 lines
Quoted 3 lines
arch/s390/include/uapi/asm/virtio-ccw.h +0 -0
 /*
  * Definitions for virtio-ccw devices.
  *
#3 lore raw
In reply to Michael S. Tsirkin
Quoted 9 lines · Michael S. Tsirkin

Virtio UAPI headers aren't just for UAPI, it's for guests/hypervisors as well. The s390 ones need to be BSD as well.

Fixes e2be04c7f995 ("License cleanup: add SPDX license identifier to uapi header files with a license")
Cc Greg Kroah-Hartman <[email protected]>

---

Christian, I would appreciate your ack if you agree.

You are changing the license on this file, you can't just slap a BSD one on the top, and have GPL below it without saying something about both covering the file, right?

arch/s390/include/uapi/asm/kvm_virtio.h line 1

Quoted 11 lines
 arch/s390/include/uapi/asm/kvm_virtio.h | 26 ++++++++++++++++++++++-
 arch/s390/include/uapi/asm/virtio-ccw.h | 37 ++++++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)
arch/s390/include/uapi/asm/kvm_virtio.h +0 -1
index 7328367..1773693 100644
@@ -1,4 +1,28 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

There is a dual-license SPDX identifier you can use, please use that, if you agree to relicense this file.

thanks,

greg k-h

#4 lore raw
Quoted 32 lines · Greg Kroah-Hartman
Quoted 9 lines · Michael S. Tsirkin

Virtio UAPI headers aren't just for UAPI, it's for guests/hypervisors as well. The s390 ones need to be BSD as well.

Fixes e2be04c7f995 ("License cleanup: add SPDX license identifier to uapi header files with a license")
Cc Greg Kroah-Hartman <[email protected]>

---

Christian, I would appreciate your ack if you agree.

You are changing the license on this file, you can't just slap a BSD one on the top, and have GPL below it without saying something about both covering the file, right?

arch/s390/include/uapi/asm/kvm_virtio.h line 1

Quoted 11 lines
 arch/s390/include/uapi/asm/kvm_virtio.h | 26 ++++++++++++++++++++++-
 arch/s390/include/uapi/asm/virtio-ccw.h | 37 ++++++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)
arch/s390/include/uapi/asm/kvm_virtio.h +0 -1
index 7328367..1773693 100644
@@ -1,4 +1,28 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

There is a dual-license SPDX identifier you can use, please use that, if you agree to relicense this file.

Quoted 3 lines

thanks,

greg k-h

Will do, thanks.

Signature · 1 line
MST