On Fri, Nov 24, 2017 at 03:09:18PM +0100, Heiko Carstens wrote: > On Fri, Nov 24, 2017 at 07:21:09AM +0200, Michael S. Tsirkin wrote: > > The original intent of the virtio header relicensing > > from 2008 was to make sure anyone can implement compatible > > devices/drivers. The virtio-ccw was omitted by mistake. > > > > We have an ack from the only contributor as well as the > > maintainer from IBM, so it's not too late to fix that. > > > > Make it dual-licensed with GPLv2, as the whole kernel is GPL2. > > > > Acked-by: Christian Borntraeger <borntraeger@xxxxxxxxxx> > > Acked-by: Cornelia Huck <cohuck@xxxxxxxxxx> > > Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx> > > --- > > arch/s390/include/uapi/asm/virtio-ccw.h | 32 +++++++++++++++++++++++++++----- > > 1 file changed, 27 insertions(+), 5 deletions(-) > > > > diff --git a/arch/s390/include/uapi/asm/virtio-ccw.h b/arch/s390/include/uapi/asm/virtio-ccw.h > > index 967aad3..41c267e 100644 > > --- a/arch/s390/include/uapi/asm/virtio-ccw.h > > +++ b/arch/s390/include/uapi/asm/virtio-ccw.h > > @@ -1,14 +1,36 @@ > > -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ > > +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note or BSD-3-Clause */ > > Could you change this and use a correct SPDX License Expression format, please? > > SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) Will do, should be consistent with rest of the kernel. But I note that WITH has higher precedence than OR. And I followed a dual license example from https://wiki.spdx.org/view/SPDX_FAQ if lower-case or isn't allowed, maybe that should be fixed. > > /* > > * Definitions for virtio-ccw devices. > > * > > * Copyright IBM Corp. 2013 > > * > > - * 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): Cornelia Huck <cornelia.huck@xxxxxxxxxx> > > + * > > + * 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. > > Is there any reason to add the whole BSD 3 clause license text? I'd prefer > if it would be just the simple new SPDX-License-Identifier above. -- To unsubscribe from this list: send the line "unsubscribe linux-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
