| Message ID | 20240223161300.938542-1-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/rtc/sun4v-rtc: Relicense to GPLv2-or-later | expand |
Peter Maydell <peter.maydell@linaro.org> writes: > The sun4v RTC device model added under commit a0e893039cf2ce0 in 2016 > was unfortunately added with a license of GPL-v3-or-later, which is > not compatible with other QEMU code which has a GPL-v2-only license. > > Relicense the code in the .c and the .h file to GPL-v2-or-later, > to make it compatible with the rest of QEMU. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Acked-by: Alex Bennée <alex.bennee@linaro.org>
Alex Bennée <alex.bennee@linaro.org> writes: > Peter Maydell <peter.maydell@linaro.org> writes: > >> The sun4v RTC device model added under commit a0e893039cf2ce0 in 2016 >> was unfortunately added with a license of GPL-v3-or-later, which is >> not compatible with other QEMU code which has a GPL-v2-only license. >> >> Relicense the code in the .c and the .h file to GPL-v2-or-later, >> to make it compatible with the rest of QEMU. >> >> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > > Acked-by: Alex Bennée <alex.bennee@linaro.org> Or a Signed-off-by: Alex Bennée <alex.bennee@linaro.org> if you prefer.
Peter Maydell <peter.maydell@linaro.org> writes: > The sun4v RTC device model added under commit a0e893039cf2ce0 in 2016 > was unfortunately added with a license of GPL-v3-or-later, which is > not compatible with other QEMU code which has a GPL-v2-only license. > > Relicense the code in the .c and the .h file to GPL-v2-or-later, > to make it compatible with the rest of QEMU. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > Before we can commit this to either head-of-git or any stable branch, > we need a Signed-off-by: from everybody who's touched this file (or, > for corporate contributions, from somebody from the relevant company > who can confirm that the company is OK with the licensing, which is > RedHat and Linaro in this case). > > The full list of people who've made changes to the file is: > Artyom Tarasenko <atar4qemu@gmail.com> > Philippe Mathieu-Daudé <philmd@linaro.org> > Markus Armbruster <armbru@redhat.com> > Eduardo Habkost <ehabkost@redhat.com> I'm cc'ing eduardo@habkost.net. > (Artyom is the original author; everybody else's changes are largely > mechanical, refactoring, etc. We've done some behind-the-scenes > coordination so I don't anticipate any problems getting the > signoffs.) I doubt my contributions to these files are creative enough to qualify for copyright, but better safe than sorry: Signed-off-by: Markus Armbruster <armbru@redhat.com>
On Fri, Feb 23, 2024 at 5:13 PM Peter Maydell <peter.maydell@linaro.org> wrote: > > The sun4v RTC device model added under commit a0e893039cf2ce0 in 2016 > was unfortunately added with a license of GPL-v3-or-later, which is > not compatible with other QEMU code which has a GPL-v2-only license. > > Relicense the code in the .c and the .h file to GPL-v2-or-later, > to make it compatible with the rest of QEMU. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com> > --- > Before we can commit this to either head-of-git or any stable branch, > we need a Signed-off-by: from everybody who's touched this file (or, > for corporate contributions, from somebody from the relevant company > who can confirm that the company is OK with the licensing, which is > RedHat and Linaro in this case). > > The full list of people who've made changes to the file is: > Artyom Tarasenko <atar4qemu@gmail.com> > Philippe Mathieu-Daudé <philmd@linaro.org> > Markus Armbruster <armbru@redhat.com> > Eduardo Habkost <ehabkost@redhat.com> > > (Artyom is the original author; everybody else's changes are largely > mechanical, refactoring, etc. We've done some behind-the-scenes > coordination so I don't anticipate any problems getting the > signoffs.) > --- > include/hw/rtc/sun4v-rtc.h | 2 +- > hw/rtc/sun4v-rtc.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/hw/rtc/sun4v-rtc.h b/include/hw/rtc/sun4v-rtc.h > index fc54dfcba47..26a9eb61967 100644 > --- a/include/hw/rtc/sun4v-rtc.h > +++ b/include/hw/rtc/sun4v-rtc.h > @@ -5,7 +5,7 @@ > * > * Copyright (c) 2016 Artyom Tarasenko > * > - * This code is licensed under the GNU GPL v3 or (at your option) any later > + * This code is licensed under the GNU GPL v2 or (at your option) any later > * version. > */ > > diff --git a/hw/rtc/sun4v-rtc.c b/hw/rtc/sun4v-rtc.c > index e037acd1b56..ffcc0aa25d9 100644 > --- a/hw/rtc/sun4v-rtc.c > +++ b/hw/rtc/sun4v-rtc.c > @@ -5,7 +5,7 @@ > * > * Copyright (c) 2016 Artyom Tarasenko > * > - * This code is licensed under the GNU GPL v3 or (at your option) any later > + * This code is licensed under the GNU GPL v2 or (at your option) any later > * version. > */ > > -- > 2.34.1 >
On 23/2/24 17:13, Peter Maydell wrote: > The sun4v RTC device model added under commit a0e893039cf2ce0 in 2016 > was unfortunately added with a license of GPL-v3-or-later, which is > not compatible with other QEMU code which has a GPL-v2-only license. > > Relicense the code in the .c and the .h file to GPL-v2-or-later, > to make it compatible with the rest of QEMU. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > Before we can commit this to either head-of-git or any stable branch, > we need a Signed-off-by: from everybody who's touched this file (or, > for corporate contributions, from somebody from the relevant company > who can confirm that the company is OK with the licensing, which is > RedHat and Linaro in this case). > > The full list of people who've made changes to the file is: > Artyom Tarasenko <atar4qemu@gmail.com> > Philippe Mathieu-Daudé <philmd@linaro.org> > Markus Armbruster <armbru@redhat.com> > Eduardo Habkost <ehabkost@redhat.com> > > (Artyom is the original author; everybody else's changes are largely > mechanical, refactoring, etc. We've done some behind-the-scenes > coordination so I don't anticipate any problems getting the > signoffs.) > --- > include/hw/rtc/sun4v-rtc.h | 2 +- > hw/rtc/sun4v-rtc.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/hw/rtc/sun4v-rtc.h b/include/hw/rtc/sun4v-rtc.h > index fc54dfcba47..26a9eb61967 100644 > --- a/include/hw/rtc/sun4v-rtc.h > +++ b/include/hw/rtc/sun4v-rtc.h > @@ -5,7 +5,7 @@ > * > * Copyright (c) 2016 Artyom Tarasenko > * > - * This code is licensed under the GNU GPL v3 or (at your option) any later > + * This code is licensed under the GNU GPL v2 or (at your option) any later > * version. > */ > > diff --git a/hw/rtc/sun4v-rtc.c b/hw/rtc/sun4v-rtc.c > index e037acd1b56..ffcc0aa25d9 100644 > --- a/hw/rtc/sun4v-rtc.c > +++ b/hw/rtc/sun4v-rtc.c > @@ -5,7 +5,7 @@ > * > * Copyright (c) 2016 Artyom Tarasenko > * > - * This code is licensed under the GNU GPL v3 or (at your option) any later > + * This code is licensed under the GNU GPL v2 or (at your option) any later > * version. > */ >
On Fri, Feb 23, 2024 at 04:13:00PM +0000, Peter Maydell wrote: > The sun4v RTC device model added under commit a0e893039cf2ce0 in 2016 > was unfortunately added with a license of GPL-v3-or-later, which is > not compatible with other QEMU code which has a GPL-v2-only license. > > Relicense the code in the .c and the .h file to GPL-v2-or-later, > to make it compatible with the rest of QEMU. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > Before we can commit this to either head-of-git or any stable branch, > we need a Signed-off-by: from everybody who's touched this file (or, > for corporate contributions, from somebody from the relevant company > who can confirm that the company is OK with the licensing, which is > RedHat and Linaro in this case). > > The full list of people who've made changes to the file is: > Artyom Tarasenko <atar4qemu@gmail.com> > Philippe Mathieu-Daudé <philmd@linaro.org> NB mailmap translations - the commit was philmd@redhat.com originally > Markus Armbruster <armbru@redhat.com> > Eduardo Habkost <ehabkost@redhat.com> On behalf of Red Hat, I can confirm that any contributions to this file where Red Hat would hold copyright are acceptable to relicense to GPL-v2-or-later. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel
On 5/3/24 12:58, Daniel P. Berrangé wrote: > On Fri, Feb 23, 2024 at 04:13:00PM +0000, Peter Maydell wrote: >> The sun4v RTC device model added under commit a0e893039cf2ce0 in 2016 >> was unfortunately added with a license of GPL-v3-or-later, which is >> not compatible with other QEMU code which has a GPL-v2-only license. >> >> Relicense the code in the .c and the .h file to GPL-v2-or-later, >> to make it compatible with the rest of QEMU. >> >> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> >> --- >> Before we can commit this to either head-of-git or any stable branch, >> we need a Signed-off-by: from everybody who's touched this file (or, >> for corporate contributions, from somebody from the relevant company >> who can confirm that the company is OK with the licensing, which is >> RedHat and Linaro in this case). >> >> The full list of people who've made changes to the file is: >> Artyom Tarasenko <atar4qemu@gmail.com> >> Philippe Mathieu-Daudé <philmd@linaro.org> > > NB mailmap translations - the commit was philmd@redhat.com originally Oh I missed that... >> Markus Armbruster <armbru@redhat.com> >> Eduardo Habkost <ehabkost@redhat.com> > > On behalf of Red Hat, I can confirm that any contributions to > this file where Red Hat would hold copyright are acceptable > to relicense to GPL-v2-or-later. > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Thank you! Phil.
On Fri, Feb 23, 2024 at 5:13 PM Peter Maydell <peter.maydell@linaro.org> wrote: > > The sun4v RTC device model added under commit a0e893039cf2ce0 in 2016 > was unfortunately added with a license of GPL-v3-or-later, which is > not compatible with other QEMU code which has a GPL-v2-only license. > > Relicense the code in the .c and the .h file to GPL-v2-or-later, > to make it compatible with the rest of QEMU. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > Before we can commit this to either head-of-git or any stable branch, > we need a Signed-off-by: from everybody who's touched this file (or, > for corporate contributions, from somebody from the relevant company > who can confirm that the company is OK with the licensing, which is > RedHat and Linaro in this case). All contributions from Red Hat are GPLv2 or later (though it's nice that Markus signed off on his own), so Signed-off-by: Paolo Bonzini (for Red Hat) <pbonzini@redhat.com> Paolo > The full list of people who've made changes to the file is: > Artyom Tarasenko <atar4qemu@gmail.com> > Philippe Mathieu-Daudé <philmd@linaro.org> > Markus Armbruster <armbru@redhat.com> > Eduardo Habkost <ehabkost@redhat.com> > > (Artyom is the original author; everybody else's changes are largely > mechanical, refactoring, etc. We've done some behind-the-scenes > coordination so I don't anticipate any problems getting the > signoffs.) > --- > include/hw/rtc/sun4v-rtc.h | 2 +- > hw/rtc/sun4v-rtc.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/hw/rtc/sun4v-rtc.h b/include/hw/rtc/sun4v-rtc.h > index fc54dfcba47..26a9eb61967 100644 > --- a/include/hw/rtc/sun4v-rtc.h > +++ b/include/hw/rtc/sun4v-rtc.h > @@ -5,7 +5,7 @@ > * > * Copyright (c) 2016 Artyom Tarasenko > * > - * This code is licensed under the GNU GPL v3 or (at your option) any later > + * This code is licensed under the GNU GPL v2 or (at your option) any later > * version. > */ > > diff --git a/hw/rtc/sun4v-rtc.c b/hw/rtc/sun4v-rtc.c > index e037acd1b56..ffcc0aa25d9 100644 > --- a/hw/rtc/sun4v-rtc.c > +++ b/hw/rtc/sun4v-rtc.c > @@ -5,7 +5,7 @@ > * > * Copyright (c) 2016 Artyom Tarasenko > * > - * This code is licensed under the GNU GPL v3 or (at your option) any later > + * This code is licensed under the GNU GPL v2 or (at your option) any later > * version. > */ > > -- > 2.34.1 >
On Tue, 5 Mar 2024 at 14:29, Paolo Bonzini <pbonzini@redhat.com> wrote: > > On Fri, Feb 23, 2024 at 5:13 PM Peter Maydell <peter.maydell@linaro.org> wrote: > > > > The sun4v RTC device model added under commit a0e893039cf2ce0 in 2016 > > was unfortunately added with a license of GPL-v3-or-later, which is > > not compatible with other QEMU code which has a GPL-v2-only license. > > > > Relicense the code in the .c and the .h file to GPL-v2-or-later, > > to make it compatible with the rest of QEMU. > > > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > > --- > > Before we can commit this to either head-of-git or any stable branch, > > we need a Signed-off-by: from everybody who's touched this file (or, > > for corporate contributions, from somebody from the relevant company > > who can confirm that the company is OK with the licensing, which is > > RedHat and Linaro in this case). > > All contributions from Red Hat are GPLv2 or later (though it's nice > that Markus signed off on his own), so > > Signed-off-by: Paolo Bonzini (for Red Hat) <pbonzini@redhat.com> Excellent. I believe that is then everybody's signoff that we need, so I'll make sure this gets into a pullreq by the end of the week (and add the cc:stable tag for it). Thanks everybody for your assistance in getting this sorted out. -- PMM
diff --git a/include/hw/rtc/sun4v-rtc.h b/include/hw/rtc/sun4v-rtc.h index fc54dfcba47..26a9eb61967 100644 --- a/include/hw/rtc/sun4v-rtc.h +++ b/include/hw/rtc/sun4v-rtc.h @@ -5,7 +5,7 @@ * * Copyright (c) 2016 Artyom Tarasenko * - * This code is licensed under the GNU GPL v3 or (at your option) any later + * This code is licensed under the GNU GPL v2 or (at your option) any later * version. */ diff --git a/hw/rtc/sun4v-rtc.c b/hw/rtc/sun4v-rtc.c index e037acd1b56..ffcc0aa25d9 100644 --- a/hw/rtc/sun4v-rtc.c +++ b/hw/rtc/sun4v-rtc.c @@ -5,7 +5,7 @@ * * Copyright (c) 2016 Artyom Tarasenko * - * This code is licensed under the GNU GPL v3 or (at your option) any later + * This code is licensed under the GNU GPL v2 or (at your option) any later * version. */
The sun4v RTC device model added under commit a0e893039cf2ce0 in 2016 was unfortunately added with a license of GPL-v3-or-later, which is not compatible with other QEMU code which has a GPL-v2-only license. Relicense the code in the .c and the .h file to GPL-v2-or-later, to make it compatible with the rest of QEMU. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- Before we can commit this to either head-of-git or any stable branch, we need a Signed-off-by: from everybody who's touched this file (or, for corporate contributions, from somebody from the relevant company who can confirm that the company is OK with the licensing, which is RedHat and Linaro in this case). The full list of people who've made changes to the file is: Artyom Tarasenko <atar4qemu@gmail.com> Philippe Mathieu-Daudé <philmd@linaro.org> Markus Armbruster <armbru@redhat.com> Eduardo Habkost <ehabkost@redhat.com> (Artyom is the original author; everybody else's changes are largely mechanical, refactoring, etc. We've done some behind-the-scenes coordination so I don't anticipate any problems getting the signoffs.) --- include/hw/rtc/sun4v-rtc.h | 2 +- hw/rtc/sun4v-rtc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)