lkml.org 
[lkml]   [2001]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: Linux 2.4.17-pre1
From
Date
On Wed, 2001-11-28 at 18:39, Alan Cox wrote:
> > use "BSD without advertising clause", which causes the kernel to be
> > tainted. Shouldn't fs/nls/*.c use "Dual BSD/GPL" or "GPL" instead?
>
> Dual BSD/GPL is the correct one. Not a big issue. Since the GPL allows
> stuff to be freer than GPL but still GPL its arguably correct too I
> suspect

I was waiting for confirmation about the license status...without
getting into what license is correct and legal, the current
MODULE_LICENSE value taints the kernel. The attached patch switches to
Dual BSD/GPL.

Marcelo, please apply.

Robert Love

diff -urN linux-2.4.17-pre1/fs/nls/nls_cp1251.c linux/fs/nls/nls_cp1251.c
--- linux-2.4.17-pre1/fs/nls/nls_cp1251.c Wed Nov 28 15:15:10 2001
+++ linux/fs/nls/nls_cp1251.c Wed Nov 28 18:41:14 2001
@@ -315,4 +315,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp1255.c linux/fs/nls/nls_cp1255.c
--- linux-2.4.17-pre1/fs/nls/nls_cp1255.c Wed Nov 28 15:15:10 2001
+++ linux/fs/nls/nls_cp1255.c Wed Nov 28 18:41:29 2001
@@ -396,4 +396,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp437.c linux/fs/nls/nls_cp437.c
--- linux-2.4.17-pre1/fs/nls/nls_cp437.c Wed Nov 28 15:15:09 2001
+++ linux/fs/nls/nls_cp437.c Wed Nov 28 18:41:40 2001
@@ -401,4 +401,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp737.c linux/fs/nls/nls_cp737.c
--- linux-2.4.17-pre1/fs/nls/nls_cp737.c Wed Nov 28 15:15:09 2001
+++ linux/fs/nls/nls_cp737.c Wed Nov 28 18:41:50 2001
@@ -364,4 +364,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp775.c linux/fs/nls/nls_cp775.c
--- linux-2.4.17-pre1/fs/nls/nls_cp775.c Wed Nov 28 15:15:09 2001
+++ linux/fs/nls/nls_cp775.c Wed Nov 28 18:42:00 2001
@@ -333,4 +333,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp850.c linux/fs/nls/nls_cp850.c
--- linux-2.4.17-pre1/fs/nls/nls_cp850.c Wed Nov 28 15:15:09 2001
+++ linux/fs/nls/nls_cp850.c Wed Nov 28 18:42:10 2001
@@ -329,4 +329,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp852.c linux/fs/nls/nls_cp852.c
--- linux-2.4.17-pre1/fs/nls/nls_cp852.c Wed Nov 28 15:15:09 2001
+++ linux/fs/nls/nls_cp852.c Wed Nov 28 18:42:22 2001
@@ -351,4 +351,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp855.c linux/fs/nls/nls_cp855.c
--- linux-2.4.17-pre1/fs/nls/nls_cp855.c Wed Nov 28 15:15:09 2001
+++ linux/fs/nls/nls_cp855.c Wed Nov 28 18:42:34 2001
@@ -313,4 +313,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp857.c linux/fs/nls/nls_cp857.c
--- linux-2.4.17-pre1/fs/nls/nls_cp857.c Wed Nov 28 15:15:09 2001
+++ linux/fs/nls/nls_cp857.c Wed Nov 28 18:43:07 2001
@@ -315,4 +315,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp860.c linux/fs/nls/nls_cp860.c
--- linux-2.4.17-pre1/fs/nls/nls_cp860.c Wed Nov 28 15:15:09 2001
+++ linux/fs/nls/nls_cp860.c Wed Nov 28 18:45:14 2001
@@ -378,4 +378,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp861.c linux/fs/nls/nls_cp861.c
--- linux-2.4.17-pre1/fs/nls/nls_cp861.c Wed Nov 28 15:15:09 2001
+++ linux/fs/nls/nls_cp861.c Wed Nov 28 18:43:42 2001
@@ -401,4 +401,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp862.c linux/fs/nls/nls_cp862.c
--- linux-2.4.17-pre1/fs/nls/nls_cp862.c Wed Nov 28 15:15:09 2001
+++ linux/fs/nls/nls_cp862.c Wed Nov 28 18:43:50 2001
@@ -435,4 +435,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp863.c linux/fs/nls/nls_cp863.c
--- linux-2.4.17-pre1/fs/nls/nls_cp863.c Wed Nov 28 15:15:09 2001
+++ linux/fs/nls/nls_cp863.c Wed Nov 28 18:43:59 2001
@@ -395,4 +395,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp864.c linux/fs/nls/nls_cp864.c
--- linux-2.4.17-pre1/fs/nls/nls_cp864.c Wed Nov 28 15:15:09 2001
+++ linux/fs/nls/nls_cp864.c Wed Nov 28 18:44:07 2001
@@ -421,4 +421,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp865.c linux/fs/nls/nls_cp865.c
--- linux-2.4.17-pre1/fs/nls/nls_cp865.c Wed Nov 28 15:15:09 2001
+++ linux/fs/nls/nls_cp865.c Wed Nov 28 18:44:16 2001
@@ -401,4 +401,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp866.c linux/fs/nls/nls_cp866.c
--- linux-2.4.17-pre1/fs/nls/nls_cp866.c Wed Nov 28 15:15:09 2001
+++ linux/fs/nls/nls_cp866.c Wed Nov 28 18:44:36 2001
@@ -319,4 +319,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp869.c linux/fs/nls/nls_cp869.c
--- linux-2.4.17-pre1/fs/nls/nls_cp869.c Wed Nov 28 15:15:09 2001
+++ linux/fs/nls/nls_cp869.c Wed Nov 28 18:44:43 2001
@@ -329,4 +329,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
diff -urN linux-2.4.17-pre1/fs/nls/nls_cp874.c linux/fs/nls/nls_cp874.c
--- linux-2.4.17-pre1/fs/nls/nls_cp874.c Wed Nov 28 15:15:09 2001
+++ linux/fs/nls/nls_cp874.c Wed Nov 28 18:44:51 2001
@@ -287,4 +287,4 @@
* c-continued-brace-offset: 0
* End:
*/
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:13    [W:0.048 / U:7.716 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site