On Tue, Nov 28, 2017 at 02:51:19PM +0100, Cornelia Huck wrote: > On Tue, 28 Nov 2017 15:17:52 +0200 > "Michael S. Tsirkin" <mst@xxxxxxxxxx> 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 | 6 +----- > > arch/s390/kernel/setup.c | 1 - > > 2 files changed, 1 insertion(+), 6 deletions(-) > > > > diff --git a/arch/s390/include/uapi/asm/virtio-ccw.h b/arch/s390/include/uapi/asm/virtio-ccw.h > > index 967aad3..2b605f7 100644 > > --- a/arch/s390/include/uapi/asm/virtio-ccw.h > > +++ b/arch/s390/include/uapi/asm/virtio-ccw.h > > @@ -1,13 +1,9 @@ > > -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ > > +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ > > /* > > * 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> > > */ > > #ifndef __KVM_VIRTIO_CCW_H > > diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c > > index 164a1e1..c022007 100644 > > --- a/arch/s390/kernel/setup.c > > +++ b/arch/s390/kernel/setup.c > > @@ -60,7 +60,6 @@ > > #include <asm/ptrace.h> > > #include <asm/sections.h> > > #include <asm/ebcdic.h> > > -#include <asm/kvm_virtio.h> > > #include <asm/diag.h> > > #include <asm/os_info.h> > > #include <asm/sclp.h> > > Shouldn't the second hunk already be in master? > > Still ack otherwise. The removal of the license text is also already in linux-next, however no need to send an updated version. I'll fix it up ;) -- 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
