* Re: [PATCH v2] s390/virtio: mark headers as BSD licensed
2017-11-08 16:59 [PATCH v2] s390/virtio: mark headers as BSD licensed Michael S. Tsirkin
@ 2017-11-08 17:01 ` Michael S. Tsirkin
2017-11-08 17:28 ` Cornelia Huck
2017-11-08 17:02 ` Cornelia Huck
` (2 subsequent siblings)
3 siblings, 1 reply; 17+ messages in thread
From: Michael S. Tsirkin @ 2017-11-08 17:01 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, Christian Borntraeger, Cornelia Huck,
Martin Schwidefsky, Heiko Carstens, linux-s390
On Wed, Nov 08, 2017 at 06:59:21PM +0200, Michael S. Tsirkin 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 <gregkh@linuxfoundation.org>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
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.
> ---
>
> 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(-)
>
> diff --git a/arch/s390/include/uapi/asm/kvm_virtio.h b/arch/s390/include/uapi/asm/kvm_virtio.h
> index 7328367..1773693 100644
> --- a/arch/s390/include/uapi/asm/kvm_virtio.h
> +++ b/arch/s390/include/uapi/asm/kvm_virtio.h
> @@ -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
> *
> diff --git a/arch/s390/include/uapi/asm/virtio-ccw.h b/arch/s390/include/uapi/asm/virtio-ccw.h
> index 967aad3..ae7a6eb 100644
> --- a/arch/s390/include/uapi/asm/virtio-ccw.h
> +++ b/arch/s390/include/uapi/asm/virtio-ccw.h
> @@ -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.
> *
> --
> MST
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH v2] s390/virtio: mark headers as BSD licensed
2017-11-08 17:01 ` Michael S. Tsirkin
@ 2017-11-08 17:28 ` Cornelia Huck
0 siblings, 0 replies; 17+ messages in thread
From: Cornelia Huck @ 2017-11-08 17:28 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: linux-kernel, Greg Kroah-Hartman, Christian Borntraeger,
Martin Schwidefsky, Heiko Carstens, linux-s390
On Wed, 8 Nov 2017 19:01:07 +0200
"Michael S. Tsirkin" <mst@redhat.com> wrote:
> On Wed, Nov 08, 2017 at 06:59:21PM +0200, Michael S. Tsirkin 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 <gregkh@linuxfoundation.org>
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> 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.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2] s390/virtio: mark headers as BSD licensed
2017-11-08 16:59 [PATCH v2] s390/virtio: mark headers as BSD licensed Michael S. Tsirkin
2017-11-08 17:01 ` Michael S. Tsirkin
@ 2017-11-08 17:02 ` Cornelia Huck
2017-11-08 18:10 ` Heiko Carstens
2017-11-08 18:12 ` Christian Borntraeger
3 siblings, 0 replies; 17+ messages in thread
From: Cornelia Huck @ 2017-11-08 17:02 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: linux-kernel, Greg Kroah-Hartman, Christian Borntraeger,
Martin Schwidefsky, Heiko Carstens, linux-s390
On Wed, 8 Nov 2017 18:59:21 +0200
"Michael S. Tsirkin" <mst@redhat.com> 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 <gregkh@linuxfoundation.org>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
...but this should also get an ack by some IBMers.
> ---
>
> 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(-)
>
> diff --git a/arch/s390/include/uapi/asm/kvm_virtio.h b/arch/s390/include/uapi/asm/kvm_virtio.h
> index 7328367..1773693 100644
> --- a/arch/s390/include/uapi/asm/kvm_virtio.h
> +++ b/arch/s390/include/uapi/asm/kvm_virtio.h
> @@ -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
> *
> diff --git a/arch/s390/include/uapi/asm/virtio-ccw.h b/arch/s390/include/uapi/asm/virtio-ccw.h
> index 967aad3..ae7a6eb 100644
> --- a/arch/s390/include/uapi/asm/virtio-ccw.h
> +++ b/arch/s390/include/uapi/asm/virtio-ccw.h
> @@ -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.
> *
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH v2] s390/virtio: mark headers as BSD licensed
2017-11-08 16:59 [PATCH v2] s390/virtio: mark headers as BSD licensed Michael S. Tsirkin
2017-11-08 17:01 ` Michael S. Tsirkin
2017-11-08 17:02 ` Cornelia Huck
@ 2017-11-08 18:10 ` Heiko Carstens
2017-11-08 18:12 ` Christian Borntraeger
3 siblings, 0 replies; 17+ messages in thread
From: Heiko Carstens @ 2017-11-08 18:10 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: linux-kernel, Greg Kroah-Hartman, Christian Borntraeger,
Cornelia Huck, Martin Schwidefsky, linux-s390
On Wed, Nov 08, 2017 at 06:59:21PM +0200, Michael S. Tsirkin 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 <gregkh@linuxfoundation.org>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
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.
> ---
>
> 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(-)
>
> diff --git a/arch/s390/include/uapi/asm/kvm_virtio.h b/arch/s390/include/uapi/asm/kvm_virtio.h
> index 7328367..1773693 100644
> --- a/arch/s390/include/uapi/asm/kvm_virtio.h
> +++ b/arch/s390/include/uapi/asm/kvm_virtio.h
> @@ -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. */
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH v2] s390/virtio: mark headers as BSD licensed
2017-11-08 16:59 [PATCH v2] s390/virtio: mark headers as BSD licensed Michael S. Tsirkin
` (2 preceding siblings ...)
2017-11-08 18:10 ` Heiko Carstens
@ 2017-11-08 18:12 ` Christian Borntraeger
2017-11-08 18:15 ` Cornelia Huck
3 siblings, 1 reply; 17+ messages in thread
From: Christian Borntraeger @ 2017-11-08 18:12 UTC (permalink / raw)
To: Michael S. Tsirkin, linux-kernel
Cc: Greg Kroah-Hartman, Cornelia Huck, Martin Schwidefsky,
Heiko Carstens, linux-s390
On 11/08/2017 05:59 PM, Michael S. Tsirkin 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 <gregkh@linuxfoundation.org>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>
> since v1:
> drop an extra comment chunk, reported by Cornelia
>
> 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.
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.
> arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++-
> 2 files changed, 50 insertions(+), 2 deletions(-)
>
> diff --git a/arch/s390/include/uapi/asm/kvm_virtio.h b/arch/s390/include/uapi/asm/kvm_virtio.h
> index 7328367..1773693 100644
> --- a/arch/s390/include/uapi/asm/kvm_virtio.h
> +++ b/arch/s390/include/uapi/asm/kvm_virtio.h
> @@ -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
> *
> diff --git a/arch/s390/include/uapi/asm/virtio-ccw.h b/arch/s390/include/uapi/asm/virtio-ccw.h
> index 967aad3..ae7a6eb 100644
> --- a/arch/s390/include/uapi/asm/virtio-ccw.h
> +++ b/arch/s390/include/uapi/asm/virtio-ccw.h
> @@ -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.
> *
>
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH v2] s390/virtio: mark headers as BSD licensed
2017-11-08 18:12 ` Christian Borntraeger
@ 2017-11-08 18:15 ` Cornelia Huck
2017-11-08 18:33 ` Christian Borntraeger
0 siblings, 1 reply; 17+ messages in thread
From: Cornelia Huck @ 2017-11-08 18:15 UTC (permalink / raw)
To: Christian Borntraeger
Cc: Michael S. Tsirkin, linux-kernel, Greg Kroah-Hartman,
Martin Schwidefsky, Heiko Carstens, linux-s390
On Wed, 8 Nov 2017 19:12:25 +0100
Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> On 11/08/2017 05:59 PM, Michael S. Tsirkin 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 <gregkh@linuxfoundation.org>
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> >
> > since v1:
> > drop an extra comment chunk, reported by Cornelia
> >
> > 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?
>
>
> 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.
ISTR that the relicensing already went through... is that not the case?
I thought this was just a fixup to align with reality?
>
> > arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++-
> > 2 files changed, 50 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH v2] s390/virtio: mark headers as BSD licensed
2017-11-08 18:15 ` Cornelia Huck
@ 2017-11-08 18:33 ` Christian Borntraeger
2017-11-08 18:57 ` Christian Borntraeger
2017-11-08 19:41 ` Michael S. Tsirkin
0 siblings, 2 replies; 17+ messages in thread
From: Christian Borntraeger @ 2017-11-08 18:33 UTC (permalink / raw)
To: Cornelia Huck
Cc: Michael S. Tsirkin, linux-kernel, Greg Kroah-Hartman,
Martin Schwidefsky, Heiko Carstens, linux-s390
On 11/08/2017 07:15 PM, Cornelia Huck wrote:
> On Wed, 8 Nov 2017 19:12:25 +0100
> Christian Borntraeger <borntraeger@de.ibm.com> wrote:
>
>> On 11/08/2017 05:59 PM, Michael S. Tsirkin 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 <gregkh@linuxfoundation.org>
>>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>>> ---
>>>
>>> since v1:
>>> drop an extra comment chunk, reported by Cornelia
>>>
>>> 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?
>
>>
>>
>> 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.
>
> 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 <borntraeger@de.ibm.com>
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 <rusty@rustcorp.com.au>
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.
> I thought this was just a fixup to align with reality?
>
>>
>>> arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++-
>>> 2 files changed, 50 insertions(+), 2 deletions(-)
>
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH v2] s390/virtio: mark headers as BSD licensed
2017-11-08 18:33 ` Christian Borntraeger
@ 2017-11-08 18:57 ` Christian Borntraeger
2017-11-08 18:59 ` Christian Borntraeger
2017-11-08 19:35 ` Michael S. Tsirkin
2017-11-08 19:41 ` Michael S. Tsirkin
1 sibling, 2 replies; 17+ messages in thread
From: Christian Borntraeger @ 2017-11-08 18:57 UTC (permalink / raw)
To: Cornelia Huck
Cc: Michael S. Tsirkin, linux-kernel, Greg Kroah-Hartman,
Martin Schwidefsky, Heiko Carstens, linux-s390
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 -
On 11/08/2017 07:33 PM, Christian Borntraeger wrote:
>
>
> On 11/08/2017 07:15 PM, Cornelia Huck wrote:
>> On Wed, 8 Nov 2017 19:12:25 +0100his
>> Christian Borntraeger <borntraeger@de.ibm.com> wrote:
>>
>>> On 11/08/2017 05:59 PM, Michael S. Tsirkin 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 <gregkh@linuxfoundation.org>
>>>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>>>> ---
>>>>
>>>> since v1:
>>>> drop an extra comment chunk, reported by Cornelia
>>>>
>>>> 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?
>>
>>>
>>>
>>> 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.
>>
>> 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 <borntraeger@de.ibm.com>
> 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 <rusty@rustcorp.com.au>
> 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.
>
>> I thought this was just a fixup to align with reality?
>>
>>>
>>>> arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++-
>>>> 2 files changed, 50 insertions(+), 2 deletions(-)
>>
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH v2] s390/virtio: mark headers as BSD licensed
2017-11-08 18:57 ` Christian Borntraeger
@ 2017-11-08 18:59 ` Christian Borntraeger
2017-11-08 19:35 ` Michael S. Tsirkin
1 sibling, 0 replies; 17+ messages in thread
From: Christian Borntraeger @ 2017-11-08 18:59 UTC (permalink / raw)
To: Cornelia Huck
Cc: Michael S. Tsirkin, linux-kernel, Greg Kroah-Hartman,
Martin Schwidefsky, Heiko Carstens, linux-s390
On 11/08/2017 07:57 PM, Christian Borntraeger wrote:
> 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
GPLv2 and BSD dual licence might be better I guess.
> 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 -
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2] s390/virtio: mark headers as BSD licensed
2017-11-08 18:57 ` Christian Borntraeger
2017-11-08 18:59 ` Christian Borntraeger
@ 2017-11-08 19:35 ` Michael S. Tsirkin
2017-11-08 19:39 ` Christian Borntraeger
1 sibling, 1 reply; 17+ messages in thread
From: Michael S. Tsirkin @ 2017-11-08 19:35 UTC (permalink / raw)
To: Christian Borntraeger
Cc: Cornelia Huck, linux-kernel, Greg Kroah-Hartman,
Martin Schwidefsky, Heiko Carstens, linux-s390
On Wed, Nov 08, 2017 at 07:57:28PM +0100, Christian Borntraeger wrote:
> So what about the following
>
> - leave kvm_virtio.h unchanged and we will delete this file via the s390 tree
Seems to be used by kvm_virtio.c - are you removing that too?
> - 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.
Yes. What prompted this was Greg's patch.
>
> 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 -
>
>
> On 11/08/2017 07:33 PM, Christian Borntraeger wrote:
> >
> >
> > On 11/08/2017 07:15 PM, Cornelia Huck wrote:
> >> On Wed, 8 Nov 2017 19:12:25 +0100his
> >> Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> >>
> >>> On 11/08/2017 05:59 PM, Michael S. Tsirkin 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 <gregkh@linuxfoundation.org>
> >>>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> >>>> ---
> >>>>
> >>>> since v1:
> >>>> drop an extra comment chunk, reported by Cornelia
> >>>>
> >>>> 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?
> >>
> >>>
> >>>
> >>> 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.
> >>
> >> 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 <borntraeger@de.ibm.com>
> > 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 <rusty@rustcorp.com.au>
> > 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.
> >
> >> I thought this was just a fixup to align with reality?
> >>
> >>>
> >>>> arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++-
> >>>> 2 files changed, 50 insertions(+), 2 deletions(-)
> >>
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH v2] s390/virtio: mark headers as BSD licensed
2017-11-08 19:35 ` Michael S. Tsirkin
@ 2017-11-08 19:39 ` Christian Borntraeger
2017-11-08 19:58 ` Michael S. Tsirkin
0 siblings, 1 reply; 17+ messages in thread
From: Christian Borntraeger @ 2017-11-08 19:39 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Cornelia Huck, linux-kernel, Greg Kroah-Hartman,
Martin Schwidefsky, Heiko Carstens, linux-s390
On 11/08/2017 08:35 PM, Michael S. Tsirkin wrote:
> On Wed, Nov 08, 2017 at 07:57:28PM +0100, Christian Borntraeger wrote:
>> So what about the following
>>
>> - leave kvm_virtio.h unchanged and we will delete this file via the s390 tree
>
> Seems 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
>
>> - 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.
>
> Yes. What prompted this was Greg's patch.
>
>>
>> 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 -
>>
>>
[..]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2] s390/virtio: mark headers as BSD licensed
2017-11-08 19:39 ` Christian Borntraeger
@ 2017-11-08 19:58 ` Michael S. Tsirkin
2017-11-09 8:29 ` Christian Borntraeger
0 siblings, 1 reply; 17+ messages in thread
From: Michael S. Tsirkin @ 2017-11-08 19:58 UTC (permalink / raw)
To: Christian Borntraeger
Cc: Cornelia Huck, linux-kernel, Greg Kroah-Hartman,
Martin Schwidefsky, Heiko Carstens, linux-s390
On Wed, Nov 08, 2017 at 08:39:11PM +0100, Christian Borntraeger wrote:
>
>
> On 11/08/2017 08:35 PM, Michael S. Tsirkin wrote:
> > On Wed, Nov 08, 2017 at 07:57:28PM +0100, Christian Borntraeger wrote:
> >> So what about the following
> >>
> >> - leave kvm_virtio.h unchanged and we will delete this file via the s390 tree
> >
> > Seems 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
>
>
> >
> >> - 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.
> >
> > Yes. What prompted this was Greg's patch.
> >
> >>
> >> 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 -
> >>
> >>
>
> [..]
So for ccw if both you and Cornelia ACK, we'll be fine I think.
No one else touched this code.
--
MST
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2] s390/virtio: mark headers as BSD licensed
2017-11-08 19:58 ` Michael S. Tsirkin
@ 2017-11-09 8:29 ` Christian Borntraeger
2017-11-09 8:57 ` Cornelia Huck
2017-11-09 19:48 ` Michael S. Tsirkin
0 siblings, 2 replies; 17+ messages in thread
From: Christian Borntraeger @ 2017-11-09 8:29 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Cornelia Huck, linux-kernel, Greg Kroah-Hartman,
Martin Schwidefsky, Heiko Carstens, linux-s390
On 11/08/2017 08:58 PM, Michael S. Tsirkin wrote:
> On Wed, Nov 08, 2017 at 08:39:11PM +0100, Christian Borntraeger wrote:
>>
>>
>> On 11/08/2017 08:35 PM, Michael S. Tsirkin wrote:
>>> On Wed, Nov 08, 2017 at 07:57:28PM +0100, Christian Borntraeger wrote:
>>>> So what about the following
>>>>
>>>> - leave kvm_virtio.h unchanged and we will delete this file via the s390 tree
>>>
>>> Seems 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
>>
>>
>>>
>>>> - 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.
>>>
>>> Yes. What prompted this was Greg's patch.
>>>
>>>>
>>>> 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 -
>>>>
>>>>
>>
>> [..]
>
>
> 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
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
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.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2] s390/virtio: mark headers as BSD licensed
2017-11-09 8:29 ` Christian Borntraeger
@ 2017-11-09 8:57 ` Cornelia Huck
2017-11-09 19:48 ` Michael S. Tsirkin
1 sibling, 0 replies; 17+ messages in thread
From: Cornelia Huck @ 2017-11-09 8:57 UTC (permalink / raw)
To: Christian Borntraeger
Cc: Michael S. Tsirkin, linux-kernel, Greg Kroah-Hartman,
Martin Schwidefsky, Heiko Carstens, linux-s390
On Thu, 9 Nov 2017 09:29:32 +0100
Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> On 11/08/2017 08:58 PM, Michael S. Tsirkin wrote:
> > On Wed, Nov 08, 2017 at 08:39:11PM +0100, Christian Borntraeger wrote:
> >>
> >>
> >> On 11/08/2017 08:35 PM, Michael S. Tsirkin wrote:
> >>> On Wed, Nov 08, 2017 at 07:57:28PM +0100, Christian Borntraeger wrote:
> >>>> So what about the following
> >>>>
> >>>> - leave kvm_virtio.h unchanged and we will delete this file via the s390 tree
> >>>
> >>> Seems 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
> >>
> >>
> >>>
> >>>> - 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.
> >>>
> >>> Yes. What prompted this was Greg's patch.
> >>>
> >>>>
> >>>> 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 -
> >>>>
> >>>>
> >>
> >> [..]
> >
> >
> > 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
>
> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
>
> 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.
>
FWIW, that would be
Acked-by: Cornelia Huck <cohuck@redhat.com>
as well (I wrote the header, but any copyright is with IBM).
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2] s390/virtio: mark headers as BSD licensed
2017-11-09 8:29 ` Christian Borntraeger
2017-11-09 8:57 ` Cornelia Huck
@ 2017-11-09 19:48 ` Michael S. Tsirkin
1 sibling, 0 replies; 17+ messages in thread
From: Michael S. Tsirkin @ 2017-11-09 19:48 UTC (permalink / raw)
To: Christian Borntraeger
Cc: Cornelia Huck, linux-kernel, Greg Kroah-Hartman,
Martin Schwidefsky, Heiko Carstens, linux-s390
On Thu, Nov 09, 2017 at 09:29:32AM +0100, Christian Borntraeger wrote:
>
>
> On 11/08/2017 08:58 PM, Michael S. Tsirkin wrote:
> > On Wed, Nov 08, 2017 at 08:39:11PM +0100, Christian Borntraeger wrote:
> >>
> >>
> >> On 11/08/2017 08:35 PM, Michael S. Tsirkin wrote:
> >>> On Wed, Nov 08, 2017 at 07:57:28PM +0100, Christian Borntraeger wrote:
> >>>> So what about the following
> >>>>
> >>>> - leave kvm_virtio.h unchanged and we will delete this file via the s390 tree
> >>>
> >>> Seems 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
> >>
> >>
> >>>
> >>>> - 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.
> >>>
> >>> Yes. What prompted this was Greg's patch.
> >>>
> >>>>
> >>>> 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 -
> >>>>
> >>>>
> >>
> >> [..]
> >
> >
> > 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
>
> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
>
> 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.
Will do.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2] s390/virtio: mark headers as BSD licensed
2017-11-08 18:33 ` Christian Borntraeger
2017-11-08 18:57 ` Christian Borntraeger
@ 2017-11-08 19:41 ` Michael S. Tsirkin
1 sibling, 0 replies; 17+ messages in thread
From: Michael S. Tsirkin @ 2017-11-08 19:41 UTC (permalink / raw)
To: Christian Borntraeger
Cc: Cornelia Huck, linux-kernel, Greg Kroah-Hartman,
Martin Schwidefsky, Heiko Carstens, linux-s390
On Wed, Nov 08, 2017 at 07:33:45PM +0100, Christian Borntraeger wrote:
>
>
> On 11/08/2017 07:15 PM, Cornelia Huck wrote:
> > On Wed, 8 Nov 2017 19:12:25 +0100
> > Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> >
> >> On 11/08/2017 05:59 PM, Michael S. Tsirkin 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 <gregkh@linuxfoundation.org>
> >>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> >>> ---
> >>>
> >>> since v1:
> >>> drop an extra comment chunk, reported by Cornelia
> >>>
> >>> 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?
> >
> >>
> >>
> >> 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.
> >
> > 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 <borntraeger@de.ibm.com>
> 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 <rusty@rustcorp.com.au>
> 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.
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.
> > I thought this was just a fixup to align with reality?
> >
> >>
> >>> arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++-
> >>> 2 files changed, 50 insertions(+), 2 deletions(-)
> >
^ permalink raw reply [flat|nested] 17+ messages in thread