On Wed, Nov 08, 2017 at 05:56:50PM +0100, Cornelia Huck wrote: > 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]> > > Signed-off-by: Michael S. Tsirkin <[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(-) > > > > 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..8f505ec 100644 > > --- a/arch/s390/include/uapi/asm/virtio-ccw.h > > +++ b/arch/s390/include/uapi/asm/virtio-ccw.h > > @@ -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]> > > + */ > > This added notice looks wrong -- the virtio-ccw stuff was added in 2013.
Oops. Will send v2. > > /* > > * Definitions for virtio-ccw devices. > > *
