From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752223AbdKHSMc (ORCPT ); Wed, 8 Nov 2017 13:12:32 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:42616 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752021AbdKHSMb (ORCPT ); Wed, 8 Nov 2017 13:12:31 -0500 Subject: Re: [PATCH v2] s390/virtio: mark headers as BSD licensed To: "Michael S. Tsirkin" , linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Cornelia Huck , Martin Schwidefsky , Heiko Carstens , linux-s390@vger.kernel.org References: <1510160307-13235-1-git-send-email-mst@redhat.com> From: Christian Borntraeger Date: Wed, 8 Nov 2017 19:12:25 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <1510160307-13235-1-git-send-email-mst@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 17110818-0040-0000-0000-0000040C165A X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17110818-0041-0000-0000-000020AEB7EC Message-Id: <9c2debae-5c00-75ad-bc4d-13af9c4f431d@de.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-11-08_03:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1711080240 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Signed-off-by: Michael S. Tsirkin > --- > > 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. 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. > arch/s390/include/uapi/asm/virtio-ccw.h | 26 +++++++++++++++++++++++++- > 2 files changed, 50 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..ae7a6eb 100644 > --- a/arch/s390/include/uapi/asm/virtio-ccw.h > +++ b/arch/s390/include/uapi/asm/virtio-ccw.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. */ > /* > * Definitions for virtio-ccw devices. > * >