On 24 Aug 21 10:18:05, Alex Williamson wrote: > On Tue, 24 Aug 2021 11:52:11 -0400 > Matthew Rosato <mjrosato@xxxxxxxxxxxxx> wrote: > > > On 8/23/21 8:37 PM, Cai Huoqing wrote: > > > remove it because SPDX-License-Identifier is already used > > > and change "GPL-2.0+" to "GPL-2.0-only" > > > > Could maybe extend the commit message a little to add something along > > the lines of ' to match the more restrictive license that was specified > > by the verbose text being removed.', so as to explain why the identifier > > is being changed here. > > > > With that, > > > > Reviewed-by: Matthew Rosato <mjrosato@xxxxxxxxxxxxx> > > Agreed, I'd propose changing it to: > > The SPDX and verbose license text are redundant, however in this case > the verbose license indicates a GPL v2 only while SPDX specifies v2+. > Remove the verbose license and correct SPDX to the more restricted > version. > > I can update on commit unless Cai wishes to respin with different > wording. Thanks, > > Alex Thanks, feel free to do it, you're awesome. Cai > > > > Signed-off-by: Cai Huoqing <caihuoqing@xxxxxxxxx> > > > --- > > > v1->v2: change "GPL-2.0+" to "GPL-2.0-only" > > > > > > drivers/vfio/pci/vfio_pci_zdev.c | 7 +------ > > > 1 file changed, 1 insertion(+), 6 deletions(-) > > > > > > diff --git a/drivers/vfio/pci/vfio_pci_zdev.c b/drivers/vfio/pci/vfio_pci_zdev.c > > > index 7b011b62c766..104fcf6658db 100644 > > > --- a/drivers/vfio/pci/vfio_pci_zdev.c > > > +++ b/drivers/vfio/pci/vfio_pci_zdev.c > > > @@ -1,15 +1,10 @@ > > > -// SPDX-License-Identifier: GPL-2.0+ > > > +// SPDX-License-Identifier: GPL-2.0-only > > > /* > > > * VFIO ZPCI devices support > > > * > > > * Copyright (C) IBM Corp. 2020. All rights reserved. > > > * Author(s): Pierre Morel <pmorel@xxxxxxxxxxxxx> > > > * Matthew Rosato <mjrosato@xxxxxxxxxxxxx> > > > - * > > > - * 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. > > > - * > > > */ > > > #include <linux/io.h> > > > #include <linux/pci.h> > > > > > >
