From f37142a4e245fd3d5d0014877c568f626dbfbbde Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 13 Apr 2011 16:45:38 -0400 Subject: [PATCH] LGPLv2.1 relicensing agreements 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. Signed-off-by: Mathieu Desnoyers --- include/ust/define_trace.h | 4 ++-- include/ust/kcompat/stringify.h | 4 ++-- include/ust/marker.h | 4 ++-- include/ust/tracepoint.h | 4 ++-- include/ust/ust_trace.h | 4 ++-- lgpl-relicensing.txt | 13 ++++++++----- libust/marker.c | 4 ++-- libust/trace_event.c | 4 ++-- libust/tracepoint.c | 4 ++-- 9 files changed, 24 insertions(+), 21 deletions(-) diff --git a/include/ust/define_trace.h b/include/ust/define_trace.h index 9fa2c30d..b4a29fb2 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/kcompat/stringify.h b/include/ust/kcompat/stringify.h index 97b59cb9..4ae13d0e 100644 --- a/include/ust/kcompat/stringify.h +++ b/include/ust/kcompat/stringify.h @@ -5,8 +5,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 13d81040..48504179 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 43c1b46b..a92f4879 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 d70ad178..f2ccbe21 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 753f4539..5cec5dc5 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 +Mathieu Desnoyers Steven Rostedt + https://lkml.org/lkml/2011/4/13/484 Frederic Weisbecker Xiao Guangrong Josh Stone Lai Jiangshan -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 diff --git a/libust/marker.c b/libust/marker.c index ef606398..d475d82d 100644 --- a/libust/marker.c +++ b/libust/marker.c @@ -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/libust/trace_event.c b/libust/trace_event.c index 728140fc..f96adf68 100644 --- a/libust/trace_event.c +++ b/libust/trace_event.c @@ -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/libust/tracepoint.c b/libust/tracepoint.c index 1c4669b5..da7f3581 100644 --- a/libust/tracepoint.c +++ b/libust/tracepoint.c @@ -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 -- 2.34.1