s390/virtio: mark headers as BSD licensed
Subsystems (3)
PATCH v2 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.
---
since v1:
drop an extra comment chunk, reported by Cornelia
arch/s390/include/uapi/asm/kvm_virtio.h | 26 +++++++++++++++++++++++++- arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-)
arch/s390/include/uapi/asm/kvm_virtio.h +25 -1
@@ -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 +25 -1
@@ -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. */ /* * Definitions for virtio-ccw devices. *
Signature · 1 line
MST
Quoted 6 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]>Signed-off-by Michael S. Tsirkin <[email protected]>
A word of warning - this is completely untested. I lost my s390 cross-build setup. Tested-by would be nice, otherwise I will cross-build in the next couple of days and report here.
Quoted 79 lines
---
since v1:
drop an extra comment chunk, reported by Corneliaarch/s390/include/uapi/asm/kvm_virtio.h | 26 +++++++++++++++++++++++++- arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-)arch/s390/include/uapi/asm/kvm_virtio.h +25
-1@@ -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 +25
-1@@ -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. */ /* * Definitions for virtio-ccw devices. * Signature · 1 line
MST
Cornelia Huck
maintainerQuoted 11 lines · On Wed, 8 Nov 2017 19:01:07 +0200 "Michael S. Tsirkin" <[email protected]> wrote:
Quoted 6 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]>Signed-off-by Michael S. Tsirkin <[email protected]>A word of warning - this is completely untested. I lost my s390 cross-build setup. Tested-by would be nice, otherwise I will cross-build in the next couple of days and report here.
FWIW, it survives my cross build.
Quoted 6 lines · On Wed, 8 Nov 2017 18:59:21 +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]>Signed-off-by Michael S. Tsirkin <[email protected]>
...but this should also get an ack by some IBMers.
Quoted 77 lines
---
since v1:
drop an extra comment chunk, reported by Corneliaarch/s390/include/uapi/asm/kvm_virtio.h | 26 +++++++++++++++++++++++++- arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-)arch/s390/include/uapi/asm/kvm_virtio.h +25
-1@@ -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 +25
-1@@ -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. */ /* * Definitions for virtio-ccw devices. *
Quoted 6 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]>Signed-off-by Michael S. Tsirkin <[email protected]>
I'm not sure why you say your patch fixes the above commit. It just added a tag that described reality, while you are _proposing_ to relicense the header file.
That's a completely different story.
Quoted 40 lines
---
since v1:
drop an extra comment chunk, reported by Corneliaarch/s390/include/uapi/asm/kvm_virtio.h | 26 +++++++++++++++++++++++++- arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-)arch/s390/include/uapi/asm/kvm_virtio.h +25
-1@@ -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. */
Quoted 6 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]>Signed-off-by Michael S. Tsirkin <[email protected]>
Quoted 6 lines
---
since v1:
drop an extra comment chunk, reported by Corneliaarch/s390/include/uapi/asm/kvm_virtio.h | 26 +++++++++++++++++++++++++-
FWIW, this file will go away anyway.
Looks like the following commit in the s390 feature branch
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit/drivers/s390/virtio/Makefile?h=features&id=7fb2b2d512448cf0e914c4647a1cf02b52263702
missed this file.
Regarding the virtio-ccw.h headers it is probably something that happened by accident. Back then Rusty (as an IBMer) proposed to change all virtio headers to BSD licence.
Quoted 72 lines
arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-)arch/s390/include/uapi/asm/kvm_virtio.h +25
-1@@ -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 +25
-1@@ -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. */ /* * Definitions for virtio-ccw devices. *
Cornelia Huck
maintainerQuoted 12 lines · On Wed, 8 Nov 2017 19:12:25 +0100 Christian Borntraeger…
Quoted 11 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]>Signed-off-by Michael S. Tsirkin <[email protected]>---
since v1:
drop an extra comment chunk, reported by Cornelia
Quoted 6 lines
Quoted 1 line
arch/s390/include/uapi/asm/kvm_virtio.h | 26 +++++++++++++++++++++++++-FWIW, this file will go away anyway.
Looks like the following commit in the s390 feature branch
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit/drivers/s390/virtio/Makefile?h=features&id=7fb2b2d512448cf0e914c4647a1cf02b52263702
missed this file.
Can we simply rip this out?
Quoted 4 lines
Regarding the
virtio-ccw.hheaders it is probably something that happened by accident. Back then Rusty (as an IBMer) proposed to change all virtio headers to BSD licence.
ISTR that the relicensing already went through... is that not the case? I thought this was just a fixup to align with reality?
Quoted 3 lines
Quoted 3 lines
arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-)
Quoted 22 lines · Cornelia Huck
Quoted 12 lines · On Wed, 8 Nov 2017 19:12:25 +0100 Christian Borntraeger…
Quoted 11 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]>Signed-off-by Michael S. Tsirkin <[email protected]>---
since v1:
drop an extra comment chunk, reported by CorneliaQuoted 6 lines
Quoted 1 line
arch/s390/include/uapi/asm/kvm_virtio.h | 26 +++++++++++++++++++++++++-FWIW, this file will go away anyway.
Looks like the following commit in the s390 feature branch
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit/drivers/s390/virtio/Makefile?h=features&id=7fb2b2d512448cf0e914c4647a1cf02b52263702
missed this file.
Quoted 8 lines
Can we simply rip this out?
Quoted 4 lines
Regarding the
virtio-ccw.hheaders it is probably something that happened by accident. Back then Rusty (as an IBMer) proposed to change all virtio headers to BSD licence.ISTR that the relicensing already went through... is that not the case?
The original kvm_virtio.h code was added in 2008
commit e976a2b997fc4ad70ccc53acfe62811c4aaec851
Author: Christian Borntraeger <[email protected]> Date: Tue Mar 25 18:47:46 2008 +0100
s390: KVM guest: virtio device support, and kvm hypercalls
The BSD re-licencing happened in 2008
commit 674bfc23c585b34c42263d73fb51710d49762a23
Author: Rusty Russell <[email protected]> Date: Fri Jul 25 12:06:03 2008 -0500
virtio: clarify that ABI is usable by any implementations
We want others to implement and use virtio, so it makes sense to BSD license the non-__KERNEL__ parts of the headers to make this crystal clear.
and it seems that it missed arch/include/uapi/asm/kvm_virtio.h
arch/include/uapi/asm/virtio_ccw.h probably just copied what kvm_virtio.h had in 2013.
So its somewhat fair to assume that both files should be BSD, but they are not according to the licence statement.
Gregs SPDX change just changed the GPL text in the header files to a SPDX statement. Now Michael wants to change this to BSD as it probably was intended but not written down. Sigh.
Quoted 6 lines
I thought this was just a fixup to align with reality?
Quoted 3 lines
Quoted 3 lines
arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-)
So what about the following
- leave kvm_virtio.h unchanged and we will delete this file via the s390 tree
- change virtio_ccw.h to BSD license. The content of this file is really really trivial and it boils down to 2 defines, that can be easily reconstructed by looking at the virtio spec. Not even sure if something like this can be copyrighted.
For reference the content of this file minus comments is
- snip -
#define KVM_VIRTIO_CCW_RING_ALIGN 4096
#define KVM_S390_VIRTIO_CCW_NOTIFY 3
- snip -
Quoted 77 lines · Christian Borntraeger
Quoted 22 lines · Cornelia Huck
Quoted 12 lines · On Wed, 8 Nov 2017 19:12:25 +0100his Christian Borntraeger…
Quoted 11 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]>Signed-off-by Michael S. Tsirkin <[email protected]>---
since v1:
drop an extra comment chunk, reported by CorneliaQuoted 6 lines
Quoted 1 line
arch/s390/include/uapi/asm/kvm_virtio.h | 26 +++++++++++++++++++++++++-FWIW, this file will go away anyway.
Looks like the following commit in the s390 feature branch
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit/drivers/s390/virtio/Makefile?h=features&id=7fb2b2d512448cf0e914c4647a1cf02b52263702
missed this file.Quoted 8 lines
Can we simply rip this out?
Quoted 4 lines
Regarding the
virtio-ccw.hheaders it is probably something that happened by accident. Back then Rusty (as an IBMer) proposed to change all virtio headers to BSD licence.ISTR that the relicensing already went through... is that not the case?
The original
kvm_virtio.hcode was added in 2008commit
e976a2b997fc4ad70ccc53acfe62811c4aaec851Author: Christian Borntraeger <[email protected]> Date: Tue Mar 25 18:47:46 2008 +0100s390: KVM guest: virtio device support, and kvm hypercalls
The BSD re-licencing happened in 2008
commit
674bfc23c585b34c42263d73fb51710d49762a23Author: Rusty Russell <[email protected]> Date: Fri Jul 25 12:06:03 2008 -0500virtio: clarify that ABI is usable by any implementations
We want others to implement and use virtio, so it makes sense to BSD license the non-__KERNEL__ parts of the headers to make this crystal clear.
and it seems that it missed
arch/include/uapi/asm/kvm_virtio.h
arch/include/uapi/asm/virtio_ccw.hprobably just copied whatkvm_virtio.hhad in 2013.So its somewhat fair to assume that both files should be BSD, but they are not according to the licence statement.
Gregs SPDX change just changed the GPL text in the header files to a SPDX statement. Now Michael wants to change this to BSD as it probably was intended but not written down. Sigh.
Quoted 6 lines
I thought this was just a fixup to align with reality?
Quoted 3 lines
Quoted 3 lines
arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-)
Quoted 5 lines · Christian Borntraeger
So what about the following
- leave
kvm_virtio.hunchanged and we will delete this file via the s390 tree- change
virtio_ccw.hto BSD license. The content of this file is really really trivial
GPLv2 and BSD dual licence might be better I guess.
Quoted 10 lines
and it boils down to 2 defines, that can be easily reconstructed by looking at the virtio spec. Not even sure if something like this can be copyrighted.
For reference the content of this file minus comments is
- snip -
#defineKVM_VIRTIO_CCW_RING_ALIGN4096
#defineKVM_S390_VIRTIO_CCW_NOTIFY3
- snip -
Quoted 3 lines · Christian Borntraeger
So what about the following
- leave
kvm_virtio.hunchanged and we will delete this file via the s390 tree
Seems to be used by kvm_virtio.c - are you removing that too?
Quoted 3 lines
- change
virtio_ccw.hto BSD license. The content of this file is really really trivial and it boils down to 2 defines, that can be easily reconstructed by looking at the virtio spec. Not even sure if something like this can be copyrighted.
Yes. What prompted this was Greg's patch.
Quoted 87 lines
For reference the content of this file minus comments is
- snip -
#defineKVM_VIRTIO_CCW_RING_ALIGN4096
#defineKVM_S390_VIRTIO_CCW_NOTIFY3
- snip -Quoted 77 lines · Christian Borntraeger
Quoted 22 lines · Cornelia Huck
Quoted 12 lines · On Wed, 8 Nov 2017 19:12:25 +0100his Christian Borntraeger…
Quoted 11 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]>Signed-off-by Michael S. Tsirkin <[email protected]>---
since v1:
drop an extra comment chunk, reported by CorneliaQuoted 6 lines
Quoted 1 line
arch/s390/include/uapi/asm/kvm_virtio.h | 26 +++++++++++++++++++++++++-FWIW, this file will go away anyway.
Looks like the following commit in the s390 feature branch
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit/drivers/s390/virtio/Makefile?h=features&id=7fb2b2d512448cf0e914c4647a1cf02b52263702
missed this file.Quoted 8 lines
Can we simply rip this out?
Quoted 4 lines
Regarding the
virtio-ccw.hheaders it is probably something that happened by accident. Back then Rusty (as an IBMer) proposed to change all virtio headers to BSD licence.ISTR that the relicensing already went through... is that not the case?
The original
kvm_virtio.hcode was added in 2008commit
e976a2b997fc4ad70ccc53acfe62811c4aaec851Author: Christian Borntraeger <[email protected]> Date: Tue Mar 25 18:47:46 2008 +0100s390: KVM guest: virtio device support, and kvm hypercalls
The BSD re-licencing happened in 2008
commit
674bfc23c585b34c42263d73fb51710d49762a23Author: Rusty Russell <[email protected]> Date: Fri Jul 25 12:06:03 2008 -0500virtio: clarify that ABI is usable by any implementations
We want others to implement and use virtio, so it makes sense to BSD license the non-__KERNEL__ parts of the headers to make this crystal clear.
and it seems that it missed
arch/include/uapi/asm/kvm_virtio.h
arch/include/uapi/asm/virtio_ccw.hprobably just copied whatkvm_virtio.hhad in 2013.So its somewhat fair to assume that both files should be BSD, but they are not according to the licence statement.
Gregs SPDX change just changed the GPL text in the header files to a SPDX statement. Now Michael wants to change this to BSD as it probably was intended but not written down. Sigh.
Quoted 6 lines
I thought this was just a fixup to align with reality?
Quoted 3 lines
Quoted 3 lines
arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-)
Quoted 6 lines · Michael S. Tsirkin
Quoted 3 lines · Christian Borntraeger
So what about the following
- leave
kvm_virtio.hunchanged and we will delete this file via the s390 treeSeems to be used by
kvm_virtio.c- are you removing that too?
Yes, so sorry my first url for the git.kernel.org was in the wrong subfolder:
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit?h=features&id=7fb2b2d512448cf0e914c4647a1cf02b52263702
Quoted 16 lines
Quoted 4 lines
- change
virtio_ccw.hto BSD license. The content of this file is really really trivial and it boils down to 2 defines, that can be easily reconstructed by looking at the virtio spec. Not even sure if something like this can be copyrighted.Yes. What prompted this was Greg's patch.
Quoted 9 lines
For reference the content of this file minus comments is
- snip -
#defineKVM_VIRTIO_CCW_RING_ALIGN4096
#defineKVM_S390_VIRTIO_CCW_NOTIFY3
- snip -
[..]
Quoted 24 lines · Christian Borntraeger
Quoted 6 lines · Michael S. Tsirkin
Quoted 3 lines · Christian Borntraeger
So what about the following
- leave
kvm_virtio.hunchanged and we will delete this file via the s390 treeSeems to be used by
kvm_virtio.c- are you removing that too?Yes, so sorry my first url for the git.kernel.org was in the wrong subfolder:
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit?h=features&id=7fb2b2d512448cf0e914c4647a1cf02b52263702Quoted 10 lines
Quoted 4 lines
- change
virtio_ccw.hto BSD license. The content of this file is really really trivial and it boils down to 2 defines, that can be easily reconstructed by looking at the virtio spec. Not even sure if something like this can be copyrighted.Yes. What prompted this was Greg's patch.
Quoted 3 lines
For reference the content of this file minus comments is
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
- snip -
#defineKVM_VIRTIO_CCW_RING_ALIGN4096
#defineKVM_S390_VIRTIO_CCW_NOTIFY3
- snip -[..]
So for ccw if both you and Cornelia ACK, we'll be fine I think. No one else touched this code.
Signature · 1 line
MST
Christian Borntraeger
Acked-byQuoted 32 lines · Michael S. Tsirkin
Quoted 31 lines · Christian Borntraeger
Quoted 6 lines · Michael S. Tsirkin
Quoted 3 lines · Christian Borntraeger
So what about the following
- leave
kvm_virtio.hunchanged and we will delete this file via the s390 treeSeems to be used by
kvm_virtio.c- are you removing that too?Yes, so sorry my first url for the git.kernel.org was in the wrong subfolder:
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit?h=features&id=7fb2b2d512448cf0e914c4647a1cf02b52263702Quoted 16 lines
Quoted 4 lines
- change
virtio_ccw.hto BSD license. The content of this file is really really trivial and it boils down to 2 defines, that can be easily reconstructed by looking at the virtio spec. Not even sure if something like this can be copyrighted.Yes. What prompted this was Greg's patch.
Quoted 9 lines
For reference the content of this file minus comments is
- snip -
#defineKVM_VIRTIO_CCW_RING_ALIGN4096
#defineKVM_S390_VIRTIO_CCW_NOTIFY3
- snip -
Quoted 5 lines
Quoted 1 line
[..]
So for ccw if both you and Cornelia ACK, we'll be fine I think. No one else touched this code.
A patch that changes virtio_ccw.h to a dual gpl2/bsd licence is
as it matches the original intent of the virtio header relicensing from 2008 while at the same time covers the fact that the whole kernel is GPL2.
Quoted 39 lines · On Thu, 9 Nov 2017 09:29:32 +0100 Christian Borntraeger…
Quoted 32 lines · Michael S. Tsirkin
Quoted 31 lines · Christian Borntraeger
Quoted 6 lines · Michael S. Tsirkin
Quoted 3 lines · Christian Borntraeger
So what about the following
- leave
kvm_virtio.hunchanged and we will delete this file via the s390 treeSeems to be used by
kvm_virtio.c- are you removing that too?Yes, so sorry my first url for the git.kernel.org was in the wrong subfolder:
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit?h=features&id=7fb2b2d512448cf0e914c4647a1cf02b52263702Quoted 16 lines
Quoted 4 lines
- change
virtio_ccw.hto BSD license. The content of this file is really really trivial and it boils down to 2 defines, that can be easily reconstructed by looking at the virtio spec. Not even sure if something like this can be copyrighted.Yes. What prompted this was Greg's patch.
Quoted 9 lines
For reference the content of this file minus comments is
- snip -
#defineKVM_VIRTIO_CCW_RING_ALIGN4096
#defineKVM_S390_VIRTIO_CCW_NOTIFY3
- snip -Quoted 5 lines
Quoted 1 line
[..]
So for ccw if both you and Cornelia ACK, we'll be fine I think. No one else touched this code.
Quoted 8 lines
A patch that changes
virtio_ccw.hto a dual gpl2/bsd licence isas it matches the original intent of the virtio header relicensing from 2008 while at the same time covers the fact that the whole kernel is GPL2.
FWIW, that would be
as well (I wrote the header, but any copyright is with IBM).
Quoted 41 lines · Christian Borntraeger
Quoted 32 lines · Michael S. Tsirkin
Quoted 31 lines · Christian Borntraeger
Quoted 6 lines · Michael S. Tsirkin
Quoted 3 lines · Christian Borntraeger
So what about the following
- leave
kvm_virtio.hunchanged and we will delete this file via the s390 treeSeems to be used by
kvm_virtio.c- are you removing that too?Yes, so sorry my first url for the git.kernel.org was in the wrong subfolder:
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit?h=features&id=7fb2b2d512448cf0e914c4647a1cf02b52263702Quoted 16 lines
Quoted 4 lines
- change
virtio_ccw.hto BSD license. The content of this file is really really trivial and it boils down to 2 defines, that can be easily reconstructed by looking at the virtio spec. Not even sure if something like this can be copyrighted.Yes. What prompted this was Greg's patch.
Quoted 9 lines
For reference the content of this file minus comments is
- snip -
#defineKVM_VIRTIO_CCW_RING_ALIGN4096
#defineKVM_S390_VIRTIO_CCW_NOTIFY3
- snip -Quoted 5 lines
Quoted 1 line
[..]
So for ccw if both you and Cornelia ACK, we'll be fine I think. No one else touched this code.
Quoted 7 lines
A patch that changes
virtio_ccw.hto a dual gpl2/bsd licence isas it matches the original intent of the virtio header relicensing from 2008 while at the same time covers the fact that the whole kernel is GPL2.
Will do.
Quoted 64 lines · Christian Borntraeger
Quoted 22 lines · Cornelia Huck
Quoted 12 lines · On Wed, 8 Nov 2017 19:12:25 +0100 Christian Borntraeger…
Quoted 11 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]>Signed-off-by Michael S. Tsirkin <[email protected]>---
since v1:
drop an extra comment chunk, reported by CorneliaQuoted 6 lines
Quoted 1 line
arch/s390/include/uapi/asm/kvm_virtio.h | 26 +++++++++++++++++++++++++-FWIW, this file will go away anyway.
Looks like the following commit in the s390 feature branch
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit/drivers/s390/virtio/Makefile?h=features&id=7fb2b2d512448cf0e914c4647a1cf02b52263702
missed this file.Quoted 8 lines
Can we simply rip this out?
Quoted 4 lines
Regarding the
virtio-ccw.hheaders it is probably something that happened by accident. Back then Rusty (as an IBMer) proposed to change all virtio headers to BSD licence.ISTR that the relicensing already went through... is that not the case?
The original
kvm_virtio.hcode was added in 2008commit
e976a2b997fc4ad70ccc53acfe62811c4aaec851Author: Christian Borntraeger <[email protected]> Date: Tue Mar 25 18:47:46 2008 +0100s390: KVM guest: virtio device support, and kvm hypercalls
The BSD re-licencing happened in 2008
commit
674bfc23c585b34c42263d73fb51710d49762a23Author: Rusty Russell <[email protected]> Date: Fri Jul 25 12:06:03 2008 -0500virtio: clarify that ABI is usable by any implementations
We want others to implement and use virtio, so it makes sense to BSD license the non-__KERNEL__ parts of the headers to make this crystal clear.
and it seems that it missed
arch/include/uapi/asm/kvm_virtio.h
arch/include/uapi/asm/virtio_ccw.hprobably just copied whatkvm_virtio.hhad in 2013.
Quoted 6 lines
So its somewhat fair to assume that both files should be BSD, but they are not according to the licence statement.
Gregs SPDX change just changed the GPL text in the header files to a SPDX statement. Now Michael wants to change this to BSD as it probably was intended but not written down. Sigh.
So I observed you are the original author and wrote most of the code in kvm_virtio.h. I figured your ack will be enough. I can get acks from Alex, other changes seem to be mostly from you, other IBMers or trivial.
Let's do just in case.
Quoted 6 lines
Quoted 6 lines
I thought this was just a fixup to align with reality?
Quoted 3 lines
Quoted 3 lines
arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-)