From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753719AbdK2JXX (ORCPT ); Wed, 29 Nov 2017 04:23:23 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:33772 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752224AbdK2JXV (ORCPT ); Wed, 29 Nov 2017 04:23:21 -0500 Date: Wed, 29 Nov 2017 10:22:55 +0100 From: Heiko Carstens To: Cornelia Huck Cc: "Michael S. Tsirkin" , linux-kernel@vger.kernel.org, Christian Borntraeger , Martin Schwidefsky , linux-s390@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: Re: [PATCH v3] s390/virtio: add BSD license to virtio-ccw References: <1511874948-27609-1-git-send-email-mst@redhat.com> <20171128145119.2866d7a7.cohuck@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171128145119.2866d7a7.cohuck@redhat.com> X-TM-AS-GCONF: 00 x-cbid: 17112909-0040-0000-0000-000003F3D623 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17112909-0041-0000-0000-000025F6B757 Message-Id: <20171129092255.GB4061@osiris> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-11-29_03:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1711290117 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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" 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 > > Acked-by: Cornelia Huck > > Signed-off-by: Michael S. Tsirkin > > --- > > 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 > > */ > > #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 > > #include > > #include > > -#include > > #include > > #include > > #include > > 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 ;)