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 <mathieu.desnoyers@efficios.com>

diff --git a/include/ust/define_trace.h b/include/ust/define_trace.h
index 9fa2c30d415ad4a987443670c34b0e04c4393292..b4a29fb249b504eb1e9181f568fca5694306a05e 100644 (file)
--- 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 97b59cb94a6a9c67dfe89d548ee465dce2c9b589..4ae13d0e89995deabd5e5158697cca49857e4e3f 100644 (file)
--- 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 13d81040c91d3b3edd910bf683d171bcceca908d..4850417946f38fa07ad86433c2329253ba5f7162 100644 (file)
--- 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 43c1b46b4a6df4ce0047915af7133e1a44989ac8..a92f4879d104c8285f8b74eeef5b1d8746d5837f 100644 (file)
--- 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 d70ad17833b567a4124c2e11bf78b9e3aa9c0dc3..f2ccbe21e868fbbc579b871f3026f1a6a9283ff9 100644 (file)
--- 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 753f4539d8c7aafd7aa594beae7619a418b760fc..5cec5dc5b92c8600c2dc4dba5e383f1ed41faf6e 100644 (file)
--- 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@efficios.com>
+Mathieu Desnoyers             <mathieu.desnoyers@efficios.com>
 Steven Rostedt                <rostedt@goodmis.org>
+                              https://lkml.org/lkml/2011/4/13/484
 Frederic Weisbecker           <fweisbec@gmail.com>
 Xiao Guangrong                <xiaogunagrong@cn.fujitsu.com>
 Josh Stone                    <jistone@redhat.com>
 Lai Jiangshan                 <laijs@cn.fujitsu.com>
 
-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                                <zhaolei@cn.fujitsu.com>
 

diff --git a/libust/marker.c b/libust/marker.c
index ef60639897e3858477193053e15eaebb6a26ee3d..d475d82dcf834f2dd066d18858669c28f42f9cad 100644 (file)
--- 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 728140fcba420cf33c9d5de43e30e2ae4a9d4b1e..f96adf6807c35e22ea27e0801511cc7c9b3bcb01 100644 (file)
--- 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 1c4669b535890a444bacbd0805a509fb05c5f38f..da7f3581619f884b28770fcef52c38e26ff257a5 100644 (file)
--- 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