* [PATCH] hw/isa/superio: Correct the license text
@ 2020-03-12 21:37 Philippe Mathieu-Daudé
2020-03-19 11:56 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-03-12 21:37 UTC (permalink / raw)
To: qemu-devel
Cc: Thomas Huth, Michael S. Tsirkin, qemu-trivial, Paolo Bonzini,
Philippe Mathieu-Daudé, Richard Henderson
The license is the 'GNU General Public License v2.0 or later',
not 'and':
This program is free software; you can redistribute it and/ori
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version.
Fix the license comment.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/hw/isa/superio.h | 2 +-
hw/isa/isa-superio.c | 2 +-
hw/isa/smc37c669-superio.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/hw/isa/superio.h b/include/hw/isa/superio.h
index b151dcd753..147cc0a7b7 100644
--- a/include/hw/isa/superio.h
+++ b/include/hw/isa/superio.h
@@ -3,7 +3,7 @@
*
* Copyright (c) 2018 Philippe Mathieu-Daudé
*
- * This code is licensed under the GNU GPLv2 and later.
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
* SPDX-License-Identifier: GPL-2.0-or-later
*/
diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c
index c4e391916c..180a8b9625 100644
--- a/hw/isa/isa-superio.c
+++ b/hw/isa/isa-superio.c
@@ -5,7 +5,7 @@
* Copyright (c) 2011-2012 Andreas Färber
* Copyright (c) 2018 Philippe Mathieu-Daudé
*
- * This code is licensed under the GNU GPLv2 and later.
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
* SPDX-License-Identifier: GPL-2.0-or-later
*/
diff --git a/hw/isa/smc37c669-superio.c b/hw/isa/smc37c669-superio.c
index 901a9f8e65..18287741cb 100644
--- a/hw/isa/smc37c669-superio.c
+++ b/hw/isa/smc37c669-superio.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2018 Philippe Mathieu-Daudé
*
- * This code is licensed under the GNU GPLv2 and later.
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
* SPDX-License-Identifier: GPL-2.0-or-later
*/
--
2.21.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] hw/isa/superio: Correct the license text
2020-03-12 21:37 [PATCH] hw/isa/superio: Correct the license text Philippe Mathieu-Daudé
@ 2020-03-19 11:56 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2020-03-19 11:56 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-trivial, Thomas Huth, Richard Henderson, Michael S. Tsirkin
On 12/03/20 22:37, Philippe Mathieu-Daudé wrote:
> The license is the 'GNU General Public License v2.0 or later',
> not 'and':
>
> This program is free software; you can redistribute it and/ori
> modify it under the terms of the GNU General Public License as
> published by the Free Software Foundation; either version 2 of
> the License, or (at your option) any later version.
>
> Fix the license comment.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> include/hw/isa/superio.h | 2 +-
> hw/isa/isa-superio.c | 2 +-
> hw/isa/smc37c669-superio.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/hw/isa/superio.h b/include/hw/isa/superio.h
> index b151dcd753..147cc0a7b7 100644
> --- a/include/hw/isa/superio.h
> +++ b/include/hw/isa/superio.h
> @@ -3,7 +3,7 @@
> *
> * Copyright (c) 2018 Philippe Mathieu-Daudé
> *
> - * This code is licensed under the GNU GPLv2 and later.
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> * See the COPYING file in the top-level directory.
> * SPDX-License-Identifier: GPL-2.0-or-later
> */
> diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c
> index c4e391916c..180a8b9625 100644
> --- a/hw/isa/isa-superio.c
> +++ b/hw/isa/isa-superio.c
> @@ -5,7 +5,7 @@
> * Copyright (c) 2011-2012 Andreas Färber
> * Copyright (c) 2018 Philippe Mathieu-Daudé
> *
> - * This code is licensed under the GNU GPLv2 and later.
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> * See the COPYING file in the top-level directory.
> * SPDX-License-Identifier: GPL-2.0-or-later
> */
> diff --git a/hw/isa/smc37c669-superio.c b/hw/isa/smc37c669-superio.c
> index 901a9f8e65..18287741cb 100644
> --- a/hw/isa/smc37c669-superio.c
> +++ b/hw/isa/smc37c669-superio.c
> @@ -3,7 +3,7 @@
> *
> * Copyright (c) 2018 Philippe Mathieu-Daudé
> *
> - * This code is licensed under the GNU GPLv2 and later.
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> * See the COPYING file in the top-level directory.
> * SPDX-License-Identifier: GPL-2.0-or-later
> */
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-19 11:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-12 21:37 [PATCH] hw/isa/superio: Correct the license text Philippe Mathieu-Daudé
2020-03-19 11:56 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).