* [PATCH v2] vfio-pci/zdev: Remove repeated verbose license text
@ 2021-08-24 0:37 Cai Huoqing
2021-08-24 15:52 ` Matthew Rosato
2021-08-26 22:20 ` Alex Williamson
0 siblings, 2 replies; 5+ messages in thread
From: Cai Huoqing @ 2021-08-24 0:37 UTC (permalink / raw)
To: mjrosato, farman, alex.williamson, cohuck; +Cc: linux-s390, kvm, Cai Huoqing
remove it because SPDX-License-Identifier is already used
and change "GPL-2.0+" to "GPL-2.0-only"
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
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@linux.ibm.com>
* Matthew Rosato <mjrosato@linux.ibm.com>
- *
- * 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>
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] vfio-pci/zdev: Remove repeated verbose license text
2021-08-24 0:37 [PATCH v2] vfio-pci/zdev: Remove repeated verbose license text Cai Huoqing
@ 2021-08-24 15:52 ` Matthew Rosato
2021-08-24 16:18 ` Alex Williamson
2021-08-26 22:20 ` Alex Williamson
1 sibling, 1 reply; 5+ messages in thread
From: Matthew Rosato @ 2021-08-24 15:52 UTC (permalink / raw)
To: Cai Huoqing, farman, alex.williamson, cohuck; +Cc: linux-s390, kvm
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@linux.ibm.com>
>
> Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
> ---
> 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@linux.ibm.com>
> * Matthew Rosato <mjrosato@linux.ibm.com>
> - *
> - * 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>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] vfio-pci/zdev: Remove repeated verbose license text
2021-08-24 15:52 ` Matthew Rosato
@ 2021-08-24 16:18 ` Alex Williamson
2021-08-25 1:10 ` Cai Huoqing
0 siblings, 1 reply; 5+ messages in thread
From: Alex Williamson @ 2021-08-24 16:18 UTC (permalink / raw)
To: Matthew Rosato; +Cc: Cai Huoqing, farman, cohuck, linux-s390, kvm
On Tue, 24 Aug 2021 11:52:11 -0400
Matthew Rosato <mjrosato@linux.ibm.com> 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@linux.ibm.com>
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
> > Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
> > ---
> > 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@linux.ibm.com>
> > * Matthew Rosato <mjrosato@linux.ibm.com>
> > - *
> > - * 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>
> >
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] vfio-pci/zdev: Remove repeated verbose license text
2021-08-24 16:18 ` Alex Williamson
@ 2021-08-25 1:10 ` Cai Huoqing
0 siblings, 0 replies; 5+ messages in thread
From: Cai Huoqing @ 2021-08-25 1:10 UTC (permalink / raw)
To: Alex Williamson, Matthew Rosato, farman, cohuck; +Cc: linux-s390, kvm
On 24 Aug 21 10:18:05, Alex Williamson wrote:
> On Tue, 24 Aug 2021 11:52:11 -0400
> Matthew Rosato <mjrosato@linux.ibm.com> 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@linux.ibm.com>
>
> 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@baidu.com>
> > > ---
> > > 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@linux.ibm.com>
> > > * Matthew Rosato <mjrosato@linux.ibm.com>
> > > - *
> > > - * 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>
> > >
> >
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] vfio-pci/zdev: Remove repeated verbose license text
2021-08-24 0:37 [PATCH v2] vfio-pci/zdev: Remove repeated verbose license text Cai Huoqing
2021-08-24 15:52 ` Matthew Rosato
@ 2021-08-26 22:20 ` Alex Williamson
1 sibling, 0 replies; 5+ messages in thread
From: Alex Williamson @ 2021-08-26 22:20 UTC (permalink / raw)
To: Cai Huoqing; +Cc: mjrosato, farman, cohuck, linux-s390, kvm
On Tue, 24 Aug 2021 08:37:49 +0800
Cai Huoqing <caihuoqing@baidu.com> wrote:
> remove it because SPDX-License-Identifier is already used
> and change "GPL-2.0+" to "GPL-2.0-only"
>
> Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
> ---
> 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(-)
Applied to vfio next branch for v5.15 with Matthew's review and agreed
commit log wording. Thanks,
Alex
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-08-26 22:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-24 0:37 [PATCH v2] vfio-pci/zdev: Remove repeated verbose license text Cai Huoqing
2021-08-24 15:52 ` Matthew Rosato
2021-08-24 16:18 ` Alex Williamson
2021-08-25 1:10 ` Cai Huoqing
2021-08-26 22:20 ` Alex Williamson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.