Received: by 10.223.185.116 with SMTP id b49csp1069158wrg; Fri, 23 Feb 2018 11:21:08 -0800 (PST) X-Google-Smtp-Source: AH8x226+NXOk6mxeH2gpYtoHSEQ1dlSHFRuZkz9FShzLPW9VUZLRw3Tnh2hVT4ePS+gbAMLMZTlZ X-Received: by 10.98.99.199 with SMTP id x190mr2758885pfb.68.1519413668558; Fri, 23 Feb 2018 11:21:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519413668; cv=none; d=google.com; s=arc-20160816; b=T9YY+kHv1+pmUzJwxiOlcFwPXBhND9/mwvSoL2XFfO/kL0u/Ytd9Tf42JHN2N1qZzl PWHO7XU4XoiU5KKuveArV3y0ATVh8mYwIEDXgaKBq/xiW4Ljjh482/bzKWdWz4hmuLeA kvsk8EmmrjlyMQg53MOSh9Ca2z8CbMHoIhEWazWyM4l3lBRaAgd+AQ14G50JodNyHB7k tA8fgHKyJPWuZaoeMhJOfEZCiAQlQQ07MfEj/7WZK/zIEjZtNbE88CJ5i6Qh1F/tliPT SHY0ayQLdnVmboSisGv+LFHek7QX43PZKfxbQA3VJH82RJiv4N/nBkkZc+wV9fhZaA6j DEzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=4FTjyyUiIcqXR9xmcZuD3O6Da7rHQSZCSHJy1uqknH4=; b=t4Y+cF6EvJVi4Dlt8aXn4fNbOfYx3o7SzMUnmlxzGPxZcvRxPscnDKzny/yBxeRVNj 0ZvBAauWvCX09Eda7vpSdVcp+Gj80w9gvOZyicAbRbxQByZQj9QWDWYaq0wLDhv4weXq J0IImKdMD1XRw9ElLJ6SOgn8fcO+7i5+FR9qWEcdCzJdBN/J8qpP6d7q1oCx7JvQdeSL yJi9fB1vpKTeBCGpZWI7oOE22rGe5RwAcSY0JGLMIAjMonMotFoYHfD9YDZzVXdzgTwP IHPLRKE5jg87fzTwxenkG8t3RFS2zd53jG0ZTmOYRKFflVUuQg3+RkzZRpYITu0j0QdY qdQg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z100-v6si2205314plh.415.2018.02.23.11.20.54; Fri, 23 Feb 2018 11:21:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964922AbeBWSyP (ORCPT + 99 others); Fri, 23 Feb 2018 13:54:15 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:47670 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935461AbeBWSyM (ORCPT ); Fri, 23 Feb 2018 13:54:12 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id F0F4311F2; Fri, 23 Feb 2018 18:54:11 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christian Borntraeger , Cornelia Huck , "Michael S. Tsirkin" , Heiko Carstens , Martin Schwidefsky , Sasha Levin Subject: [PATCH 4.14 107/159] s390/virtio: add BSD license to virtio-ccw Date: Fri, 23 Feb 2018 19:26:55 +0100 Message-Id: <20180223170756.339678850@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: "Michael S. Tsirkin" [ Upstream commit edfb8d8fcb94a75b2e61c63549d4a5f6474ad3d2 ] 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 Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/s390/include/uapi/asm/virtio-ccw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/s390/include/uapi/asm/virtio-ccw.h +++ b/arch/s390/include/uapi/asm/virtio-ccw.h @@ -1,4 +1,4 @@ -/* 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. *