From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Williamson <alex.williamson@redhat.com>
Subject: Re: [patch 9/9] vfio/pci: Cleanup license mess
Date: Wed, 23 Jan 2019 13:05:10 -0700
Message-ID: <20190123130510.0b64bd64@w520.home>
References: <20190117231416.111952141@linutronix.de>
        <20190117231501.654003681@linutronix.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: LKML <linux-kernel@vger.kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Kate Stewart <kstewart@linuxfoundation.org>,
        Jonathan Corbet <corbet@lwn.net>,
        Alexey Kardashevskiy <aik@ozlabs.ru>,
        Michael Ellerman <mpe@ellerman.id.au>, kvm@vger.kernel.org
To: Thomas Gleixner <tglx@linutronix.de>
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20190117231501.654003681@linutronix.de>
Sender: linux-kernel-owner@vger.kernel.org
List-Id: kvm.vger.kernel.org

On Fri, 18 Jan 2019 00:14:25 +0100
Thomas Gleixner <tglx@linutronix.de> wrote:

> The recently added nvlink2 VFIO driver introduced a license conflict in two
> files. In both cases the SPDX license identifier is:
> 
>   SPDX-License-Identifier: GPL-2.0+
> 
> but the files contain also the following license boiler plate text:
> 
>   * This program is free software; you can redistribute it and/or modify
>   * it under the terms of the GNU General Public License version 2 as
>   * published by the Free Software Foundation
> 
> The latter is GPL-2.9-only and not GPL-2.0=.
> 
> Looking deeper. The nvlink source file is derived from vfio_pci_igd.c which
> is also licensed under GPL-2.0-only and it can be assumed that the file was
> copied and modified. As the original file is licensed GPL-2.0-only it's not
> possible to relicense derivative work to GPL-2.0-or-later.
> 
> Fix the SPDX identifier and remove the boiler plate as it is redundant.
> 
> Fixes: 7f92891778df ("vfio_pci: Add NVIDIA GV100GL [Tesla V100 SXM2] subdriver")
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Alexey Kardashevskiy <aik@ozlabs.ru>
> Cc: Alex Williamson <alex.williamson@redhat.com>
> Cc: Michael Ellerman <mpe@ellerman.id.au>
> Cc: kvm@vger.kernel.org
> ---
> 
> P.S.: This patch is part of a larger cleanup, but independent of other
>       patches and is intended to be picked up by the maintainer directly.

Applied to vfio for-linus branch for v5.0.  Thanks,

Alex


> ---
>  drivers/vfio/pci/trace.h            |    6 +-----
>  drivers/vfio/pci/vfio_pci_nvlink2.c |    6 +-----
>  2 files changed, 2 insertions(+), 10 deletions(-)
> 
> --- a/drivers/vfio/pci/trace.h
> +++ b/drivers/vfio/pci/trace.h
> @@ -1,13 +1,9 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> +/* SPDX-License-Identifier: GPL-2.0-only */
>  /*
>   * VFIO PCI mmap/mmap_fault tracepoints
>   *
>   * Copyright (C) 2018 IBM Corp.  All rights reserved.
>   *     Author: Alexey Kardashevskiy <aik@ozlabs.ru>
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
>   */
>  
>  #undef TRACE_SYSTEM
> --- a/drivers/vfio/pci/vfio_pci_nvlink2.c
> +++ b/drivers/vfio/pci/vfio_pci_nvlink2.c
> @@ -1,14 +1,10 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * VFIO PCI NVIDIA Whitherspoon GPU support a.k.a. NVLink2.
>   *
>   * Copyright (C) 2018 IBM Corp.  All rights reserved.
>   *     Author: Alexey Kardashevskiy <aik@ozlabs.ru>
>   *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - *
>   * Register an on-GPU RAM region for cacheable access.
>   *
>   * Derived from original vfio_pci_igd.c:
> 
>