Re: [PATCH v2] s390/virtio: mark headers as BSD licensed

Michael S. Tsirkin
2017-11-08T19:41:17Z

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(-)
> >