* Mathieu Desnoyers ([email protected]) wrote: > Steven just stated clearly that he only accepts relicencing to LGPLv2.1 > (not later). So I think we might have been interpreting his previous > acceptance a little too broadly when specifying "LGPLV2.1+". Change the > licensing text to reflect this. > > If some of the contributors specifically said they were OK with "or > later", we could add this back upon rechecking their original acceptance > email. The pointers to the original public emails should have been > present in the relicensing file to make our current job easier, but this > is unfortunately not the case.
Also updated the stringify.h, tracepoint.c, marker.c and trace_event.c files. Merged. Mathieu > > Signed-off-by: Mathieu Desnoyers <[email protected]> > --- > diff --git a/include/ust/define_trace.h b/include/ust/define_trace.h > index 9fa2c30..b4a29fb 100644 > --- a/include/ust/define_trace.h > +++ b/include/ust/define_trace.h > @@ -3,8 +3,8 @@ > * > * This library is free software; you can redistribute it and/or > * modify it under the terms of the GNU Lesser General Public > - * License as published by the Free Software Foundation; either > - * version 2.1 of the License, or (at your option) any later version. > + * License as published by the Free Software Foundation; > + * version 2.1 of the License. > * > * This library is distributed in the hope that it will be useful, > * but WITHOUT ANY WARRANTY; without even the implied warranty of > diff --git a/include/ust/marker.h b/include/ust/marker.h > index 13d8104..4850417 100644 > --- a/include/ust/marker.h > +++ b/include/ust/marker.h > @@ -8,8 +8,8 @@ > * > * This library is free software; you can redistribute it and/or > * modify it under the terms of the GNU Lesser General Public > - * License as published by the Free Software Foundation; either > - * version 2.1 of the License, or (at your option) any later version. > + * License as published by the Free Software Foundation; > + * version 2.1 of the License. > * > * This library is distributed in the hope that it will be useful, > * but WITHOUT ANY WARRANTY; without even the implied warranty of > diff --git a/include/ust/tracepoint.h b/include/ust/tracepoint.h > index 43c1b46..a92f487 100644 > --- a/include/ust/tracepoint.h > +++ b/include/ust/tracepoint.h > @@ -8,8 +8,8 @@ > * > * This library is free software; you can redistribute it and/or > * modify it under the terms of the GNU Lesser General Public > - * License as published by the Free Software Foundation; either > - * version 2.1 of the License, or (at your option) any later version. > + * License as published by the Free Software Foundation; > + * version 2.1 of the License. > * > * This library is distributed in the hope that it will be useful, > * but WITHOUT ANY WARRANTY; without even the implied warranty of > diff --git a/include/ust/ust_trace.h b/include/ust/ust_trace.h > index d70ad17..f2ccbe2 100644 > --- a/include/ust/ust_trace.h > +++ b/include/ust/ust_trace.h > @@ -4,8 +4,8 @@ > * > * This library is free software; you can redistribute it and/or > * modify it under the terms of the GNU Lesser General Public > - * License as published by the Free Software Foundation; either > - * version 2.1 of the License, or (at your option) any later version. > + * License as published by the Free Software Foundation; > + * version 2.1 of the License. > * > * This library is distributed in the hope that it will be useful, > * but WITHOUT ANY WARRANTY; without even the implied warranty of > diff --git a/lgpl-relicensing.txt b/lgpl-relicensing.txt > index 753f453..5cec5dc 100644 > --- a/lgpl-relicensing.txt > +++ b/lgpl-relicensing.txt > @@ -1,19 +1,22 @@ > Nils Carlson > Aug 30th, 2010 > +Mathieu Desnoyers > +April 13th, 2011 > > -The following copyright holders have agreed to LGPLv2.1+ re-licensing > -of their contributions to linux/include/tracepoint.h, > +The following copyright holders have agreed to LGPLv2.1 (not later) > +re-licensing of their contributions to linux/include/tracepoint.h, > linux/trace/define_trace.h as concerns the TRACE_EVENT macro. > > -Mathieu Desnoyer <[email protected]> > +Mathieu Desnoyers <[email protected]> > Steven Rostedt <[email protected]> > + https://lkml.org/lkml/2011/4/13/484 > Frederic Weisbecker <[email protected]> > Xiao Guangrong <[email protected]> > Josh Stone <[email protected]> > Lai Jiangshan <[email protected]> > > -The following copyright holders have agreed to LGPLv2.1+ re-licensing > -of their contributions to linux/include/stringify.h. > +The following copyright holders have agreed to LGPLv2.1 (not later) > +re-licensing of their contributions to linux/include/stringify.h. > > Zhaolei <[email protected]> > > > -- > Mathieu Desnoyers > Operating System Efficiency R&D Consultant > EfficiOS Inc. > http://www.efficios.com -- Mathieu Desnoyers Operating System Efficiency R&D Consultant EfficiOS Inc. http://www.efficios.com _______________________________________________ ltt-dev mailing list [email protected] http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev
