mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] fs/nls: Add SPDX ID lines to files
@ 2026-06-11 19:36 Tim Bird
  2026-06-11 20:41 ` Richard Fontana
  0 siblings, 1 reply; 3+ messages in thread
From: Tim Bird @ 2026-06-11 19:36 UTC (permalink / raw)
  To: tglx, gregkh, phcoder, hirofumi; +Cc: tim.bird, linux-spdx, linux-kernel

Almost all the files in the fs/nls directory are missing
SPDX-License-Identifier lines.  Add the Unicode-3.0 license to
LICENSES/preferred, and reference that in the ID lines for
the pertinent files.

Many of these source files were introduced in 1997 by
Gordon Chafee, who states that data tables were automatically
generated from materials on the www.unicode.org web site.
This pre-dates when that site had an explicit license, and
these files are missing any license text.

Files starting with 'mac-' prefix were added in 2012 by
Vladimir Serbinenko.  These files have an earlier Unicode license
with slight differences from the current license that is preferred by
Unicode, Inc.

Use the current Unicode license (Unicode-3.0) (in conjunction with
GPL-2.0) for all files that have data that was obtained from Unicode, Inc.
Use 'GPL-2.0' as the license ID for other files.

Signed-off-by: Tim Bird <tim.bird@sony.com>
---
There appears to be no maintainer for the fs/nls directory.
Is someone willing to take this into their tree to shepherd
into Linus' tree?

---
 LICENSES/preferred/Unicode-3.0 | 47 ++++++++++++++++++++++++++++++++++
 fs/nls/mac-celtic.c            | 37 ++------------------------
 fs/nls/mac-centeuro.c          | 37 ++------------------------
 fs/nls/mac-croatian.c          | 37 ++------------------------
 fs/nls/mac-cyrillic.c          | 37 ++------------------------
 fs/nls/mac-gaelic.c            | 37 ++------------------------
 fs/nls/mac-greek.c             | 37 ++------------------------
 fs/nls/mac-iceland.c           | 37 ++------------------------
 fs/nls/mac-inuit.c             | 37 ++------------------------
 fs/nls/mac-roman.c             | 37 ++------------------------
 fs/nls/mac-romanian.c          | 37 ++------------------------
 fs/nls/mac-turkish.c           | 37 ++------------------------
 fs/nls/nls_ascii.c             |  1 +
 fs/nls/nls_base.c              |  1 +
 fs/nls/nls_cp1250.c            |  1 +
 fs/nls/nls_cp1251.c            |  1 +
 fs/nls/nls_cp1255.c            |  1 +
 fs/nls/nls_cp437.c             |  1 +
 fs/nls/nls_cp737.c             |  1 +
 fs/nls/nls_cp775.c             |  1 +
 fs/nls/nls_cp850.c             |  1 +
 fs/nls/nls_cp852.c             |  1 +
 fs/nls/nls_cp855.c             |  1 +
 fs/nls/nls_cp857.c             |  1 +
 fs/nls/nls_cp860.c             |  1 +
 fs/nls/nls_cp861.c             |  1 +
 fs/nls/nls_cp862.c             |  1 +
 fs/nls/nls_cp863.c             |  1 +
 fs/nls/nls_cp864.c             |  1 +
 fs/nls/nls_cp865.c             |  1 +
 fs/nls/nls_cp866.c             |  1 +
 fs/nls/nls_cp869.c             |  1 +
 fs/nls/nls_cp874.c             |  1 +
 fs/nls/nls_cp932.c             |  1 +
 fs/nls/nls_cp936.c             |  1 +
 fs/nls/nls_cp949.c             |  1 +
 fs/nls/nls_cp950.c             |  1 +
 fs/nls/nls_euc-jp.c            |  1 +
 fs/nls/nls_iso8859-1.c         |  1 +
 fs/nls/nls_iso8859-13.c        |  1 +
 fs/nls/nls_iso8859-14.c        |  1 +
 fs/nls/nls_iso8859-15.c        |  1 +
 fs/nls/nls_iso8859-2.c         |  1 +
 fs/nls/nls_iso8859-3.c         |  1 +
 fs/nls/nls_iso8859-4.c         |  1 +
 fs/nls/nls_iso8859-5.c         |  1 +
 fs/nls/nls_iso8859-6.c         |  1 +
 fs/nls/nls_iso8859-7.c         |  1 +
 fs/nls/nls_iso8859-9.c         |  1 +
 fs/nls/nls_koi8-r.c            |  1 +
 fs/nls/nls_koi8-ru.c           |  1 +
 fs/nls/nls_koi8-u.c            |  1 +
 fs/nls/nls_utf8.c              |  1 +
 53 files changed, 110 insertions(+), 385 deletions(-)
 create mode 100644 LICENSES/preferred/Unicode-3.0

diff --git a/LICENSES/preferred/Unicode-3.0 b/LICENSES/preferred/Unicode-3.0
new file mode 100644
index 000000000000..f5f943f2e71e
--- /dev/null
+++ b/LICENSES/preferred/Unicode-3.0
@@ -0,0 +1,47 @@
+Valid-License-Identifier: Unicode-3.0
+SPDX-URL: https://spdx.org/licenses/Unicode-3.0.html
+Usage-Guide:
+  To use the Unicode 3.0 License put the following SPDX
+  tag/value pair into a comment according to the placement guidelines in
+  the licensing rules documentation:
+    SPDX-License-Identifier: Unicode-3.0
+License-Text:
+UNICODE LICENSE V3
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2026 Unicode, Inc.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of data files and any associated documentation (the "Data Files") or
+software and any associated documentation (the "Software") to deal in the
+Data Files or Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, and/or sell
+copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that either (a)
+this copyright and permission notice appear with all copies of the Data
+Files or Software, or (b) this copyright and permission notice appear in
+associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written
+authorization of the copyright holder.
diff --git a/fs/nls/mac-celtic.c b/fs/nls/mac-celtic.c
index 2963f3299d7e..852b1d362113 100644
--- a/fs/nls/mac-celtic.c
+++ b/fs/nls/mac-celtic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/mac-celtic.c
  *
@@ -5,42 +6,8 @@
  * Generated automatically from the Unicode and charset
  * tables from the Unicode Organization (www.unicode.org).
  * The Unicode to charset table has only exact mappings.
- */
-
-/*
- * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright 1991-2012 Unicode, Inc.  All rights reserved.  Distributed under
- * the Terms of Use in http://www.unicode.org/copyright.html.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of the Unicode data files and any associated documentation (the "Data
- * Files") or Unicode software and any associated documentation (the
- * "Software") to deal in the Data Files or Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Data Files or Software, and
- * to permit persons to whom the Data Files or Software are furnished to do
- * so, provided that (a) the above copyright notice(s) and this permission
- * notice appear with all copies of the Data Files or Software, (b) both the
- * above copyright notice(s) and this permission notice appear in associated
- * documentation, and (c) there is clear notice in each modified Data File or
- * in the Software as well as in the documentation associated with the Data
- * File(s) or Software that the data or software has been modified.
- *
- * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in these Data Files or Software without prior written
- * authorization of the copyright holder.
+ * Copyright 1991-2012 Unicode, Inc.  All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/fs/nls/mac-centeuro.c b/fs/nls/mac-centeuro.c
index 43b20f4bdb67..62e132f5d4f5 100644
--- a/fs/nls/mac-centeuro.c
+++ b/fs/nls/mac-centeuro.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/mac-centeuro.c
  *
@@ -5,42 +6,8 @@
  * Generated automatically from the Unicode and charset
  * tables from the Unicode Organization (www.unicode.org).
  * The Unicode to charset table has only exact mappings.
- */
-
-/*
- * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright 1991-2012 Unicode, Inc.  All rights reserved.  Distributed under
- * the Terms of Use in http://www.unicode.org/copyright.html.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of the Unicode data files and any associated documentation (the "Data
- * Files") or Unicode software and any associated documentation (the
- * "Software") to deal in the Data Files or Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Data Files or Software, and
- * to permit persons to whom the Data Files or Software are furnished to do
- * so, provided that (a) the above copyright notice(s) and this permission
- * notice appear with all copies of the Data Files or Software, (b) both the
- * above copyright notice(s) and this permission notice appear in associated
- * documentation, and (c) there is clear notice in each modified Data File or
- * in the Software as well as in the documentation associated with the Data
- * File(s) or Software that the data or software has been modified.
- *
- * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in these Data Files or Software without prior written
- * authorization of the copyright holder.
+ * Copyright 1991-2012 Unicode, Inc.  All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/fs/nls/mac-croatian.c b/fs/nls/mac-croatian.c
index 62730d6a64e5..3407b3323c0f 100644
--- a/fs/nls/mac-croatian.c
+++ b/fs/nls/mac-croatian.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/mac-croatian.c
  *
@@ -5,42 +6,8 @@
  * Generated automatically from the Unicode and charset
  * tables from the Unicode Organization (www.unicode.org).
  * The Unicode to charset table has only exact mappings.
- */
-
-/*
- * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright 1991-2012 Unicode, Inc.  All rights reserved.  Distributed under
- * the Terms of Use in http://www.unicode.org/copyright.html.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of the Unicode data files and any associated documentation (the "Data
- * Files") or Unicode software and any associated documentation (the
- * "Software") to deal in the Data Files or Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Data Files or Software, and
- * to permit persons to whom the Data Files or Software are furnished to do
- * so, provided that (a) the above copyright notice(s) and this permission
- * notice appear with all copies of the Data Files or Software, (b) both the
- * above copyright notice(s) and this permission notice appear in associated
- * documentation, and (c) there is clear notice in each modified Data File or
- * in the Software as well as in the documentation associated with the Data
- * File(s) or Software that the data or software has been modified.
- *
- * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in these Data Files or Software without prior written
- * authorization of the copyright holder.
+ * Copyright 1991-2012 Unicode, Inc.  All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/fs/nls/mac-cyrillic.c b/fs/nls/mac-cyrillic.c
index 7a5c4d16aac8..15df6d29b533 100644
--- a/fs/nls/mac-cyrillic.c
+++ b/fs/nls/mac-cyrillic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/mac-cyrillic.c
  *
@@ -5,42 +6,8 @@
  * Generated automatically from the Unicode and charset
  * tables from the Unicode Organization (www.unicode.org).
  * The Unicode to charset table has only exact mappings.
- */
-
-/*
- * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright 1991-2012 Unicode, Inc.  All rights reserved.  Distributed under
- * the Terms of Use in http://www.unicode.org/copyright.html.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of the Unicode data files and any associated documentation (the "Data
- * Files") or Unicode software and any associated documentation (the
- * "Software") to deal in the Data Files or Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Data Files or Software, and
- * to permit persons to whom the Data Files or Software are furnished to do
- * so, provided that (a) the above copyright notice(s) and this permission
- * notice appear with all copies of the Data Files or Software, (b) both the
- * above copyright notice(s) and this permission notice appear in associated
- * documentation, and (c) there is clear notice in each modified Data File or
- * in the Software as well as in the documentation associated with the Data
- * File(s) or Software that the data or software has been modified.
- *
- * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in these Data Files or Software without prior written
- * authorization of the copyright holder.
+ * Copyright 1991-2012 Unicode, Inc.  All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/fs/nls/mac-gaelic.c b/fs/nls/mac-gaelic.c
index 3d22f03a90b6..db7820b0fb71 100644
--- a/fs/nls/mac-gaelic.c
+++ b/fs/nls/mac-gaelic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/mac-gaelic.c
  *
@@ -5,42 +6,8 @@
  * Generated automatically from the Unicode and charset
  * tables from the Unicode Organization (www.unicode.org).
  * The Unicode to charset table has only exact mappings.
- */
-
-/*
- * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright 1991-2012 Unicode, Inc.  All rights reserved.  Distributed under
- * the Terms of Use in http://www.unicode.org/copyright.html.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of the Unicode data files and any associated documentation (the "Data
- * Files") or Unicode software and any associated documentation (the
- * "Software") to deal in the Data Files or Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Data Files or Software, and
- * to permit persons to whom the Data Files or Software are furnished to do
- * so, provided that (a) the above copyright notice(s) and this permission
- * notice appear with all copies of the Data Files or Software, (b) both the
- * above copyright notice(s) and this permission notice appear in associated
- * documentation, and (c) there is clear notice in each modified Data File or
- * in the Software as well as in the documentation associated with the Data
- * File(s) or Software that the data or software has been modified.
- *
- * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in these Data Files or Software without prior written
- * authorization of the copyright holder.
+ * Copyright 1991-2012 Unicode, Inc.  All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/fs/nls/mac-greek.c b/fs/nls/mac-greek.c
index de3aa9ddb5b1..c1f8b97d4d53 100644
--- a/fs/nls/mac-greek.c
+++ b/fs/nls/mac-greek.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/mac-greek.c
  *
@@ -5,42 +6,8 @@
  * Generated automatically from the Unicode and charset
  * tables from the Unicode Organization (www.unicode.org).
  * The Unicode to charset table has only exact mappings.
- */
-
-/*
- * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright 1991-2012 Unicode, Inc.  All rights reserved.  Distributed under
- * the Terms of Use in http://www.unicode.org/copyright.html.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of the Unicode data files and any associated documentation (the "Data
- * Files") or Unicode software and any associated documentation (the
- * "Software") to deal in the Data Files or Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Data Files or Software, and
- * to permit persons to whom the Data Files or Software are furnished to do
- * so, provided that (a) the above copyright notice(s) and this permission
- * notice appear with all copies of the Data Files or Software, (b) both the
- * above copyright notice(s) and this permission notice appear in associated
- * documentation, and (c) there is clear notice in each modified Data File or
- * in the Software as well as in the documentation associated with the Data
- * File(s) or Software that the data or software has been modified.
- *
- * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in these Data Files or Software without prior written
- * authorization of the copyright holder.
+ * Copyright 1991-2012 Unicode, Inc.  All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/fs/nls/mac-iceland.c b/fs/nls/mac-iceland.c
index 0bba83f9d415..c239917fb329 100644
--- a/fs/nls/mac-iceland.c
+++ b/fs/nls/mac-iceland.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/mac-iceland.c
  *
@@ -5,42 +6,8 @@
  * Generated automatically from the Unicode and charset
  * tables from the Unicode Organization (www.unicode.org).
  * The Unicode to charset table has only exact mappings.
- */
-
-/*
- * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright 1991-2012 Unicode, Inc.  All rights reserved.  Distributed under
- * the Terms of Use in http://www.unicode.org/copyright.html.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of the Unicode data files and any associated documentation (the "Data
- * Files") or Unicode software and any associated documentation (the
- * "Software") to deal in the Data Files or Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Data Files or Software, and
- * to permit persons to whom the Data Files or Software are furnished to do
- * so, provided that (a) the above copyright notice(s) and this permission
- * notice appear with all copies of the Data Files or Software, (b) both the
- * above copyright notice(s) and this permission notice appear in associated
- * documentation, and (c) there is clear notice in each modified Data File or
- * in the Software as well as in the documentation associated with the Data
- * File(s) or Software that the data or software has been modified.
- *
- * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in these Data Files or Software without prior written
- * authorization of the copyright holder.
+ * Copyright 1991-2012 Unicode, Inc.  All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/fs/nls/mac-inuit.c b/fs/nls/mac-inuit.c
index 493386832dfd..4dd1cd19d29b 100644
--- a/fs/nls/mac-inuit.c
+++ b/fs/nls/mac-inuit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/mac-inuit.c
  *
@@ -5,42 +6,8 @@
  * Generated automatically from the Unicode and charset
  * tables from the Unicode Organization (www.unicode.org).
  * The Unicode to charset table has only exact mappings.
- */
-
-/*
- * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright 1991-2012 Unicode, Inc.  All rights reserved.  Distributed under
- * the Terms of Use in http://www.unicode.org/copyright.html.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of the Unicode data files and any associated documentation (the "Data
- * Files") or Unicode software and any associated documentation (the
- * "Software") to deal in the Data Files or Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Data Files or Software, and
- * to permit persons to whom the Data Files or Software are furnished to do
- * so, provided that (a) the above copyright notice(s) and this permission
- * notice appear with all copies of the Data Files or Software, (b) both the
- * above copyright notice(s) and this permission notice appear in associated
- * documentation, and (c) there is clear notice in each modified Data File or
- * in the Software as well as in the documentation associated with the Data
- * File(s) or Software that the data or software has been modified.
- *
- * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in these Data Files or Software without prior written
- * authorization of the copyright holder.
+ * Copyright 1991-2012 Unicode, Inc.  All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/fs/nls/mac-roman.c b/fs/nls/mac-roman.c
index d3c082173c20..9956bd8a42a3 100644
--- a/fs/nls/mac-roman.c
+++ b/fs/nls/mac-roman.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/mac-roman.c
  *
@@ -5,42 +6,8 @@
  * Generated automatically from the Unicode and charset
  * tables from the Unicode Organization (www.unicode.org).
  * The Unicode to charset table has only exact mappings.
- */
-
-/*
- * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright 1991-2012 Unicode, Inc.  All rights reserved.  Distributed under
- * the Terms of Use in http://www.unicode.org/copyright.html.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of the Unicode data files and any associated documentation (the "Data
- * Files") or Unicode software and any associated documentation (the
- * "Software") to deal in the Data Files or Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Data Files or Software, and
- * to permit persons to whom the Data Files or Software are furnished to do
- * so, provided that (a) the above copyright notice(s) and this permission
- * notice appear with all copies of the Data Files or Software, (b) both the
- * above copyright notice(s) and this permission notice appear in associated
- * documentation, and (c) there is clear notice in each modified Data File or
- * in the Software as well as in the documentation associated with the Data
- * File(s) or Software that the data or software has been modified.
- *
- * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in these Data Files or Software without prior written
- * authorization of the copyright holder.
+ * Copyright 1991-2012 Unicode, Inc.  All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/fs/nls/mac-romanian.c b/fs/nls/mac-romanian.c
index a7735852f2d5..e954870a3a4f 100644
--- a/fs/nls/mac-romanian.c
+++ b/fs/nls/mac-romanian.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/mac-romanian.c
  *
@@ -5,42 +6,8 @@
  * Generated automatically from the Unicode and charset
  * tables from the Unicode Organization (www.unicode.org).
  * The Unicode to charset table has only exact mappings.
- */
-
-/*
- * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright 1991-2012 Unicode, Inc.  All rights reserved.  Distributed under
- * the Terms of Use in http://www.unicode.org/copyright.html.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of the Unicode data files and any associated documentation (the "Data
- * Files") or Unicode software and any associated documentation (the
- * "Software") to deal in the Data Files or Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Data Files or Software, and
- * to permit persons to whom the Data Files or Software are furnished to do
- * so, provided that (a) the above copyright notice(s) and this permission
- * notice appear with all copies of the Data Files or Software, (b) both the
- * above copyright notice(s) and this permission notice appear in associated
- * documentation, and (c) there is clear notice in each modified Data File or
- * in the Software as well as in the documentation associated with the Data
- * File(s) or Software that the data or software has been modified.
- *
- * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in these Data Files or Software without prior written
- * authorization of the copyright holder.
+ * Copyright 1991-2012 Unicode, Inc.  All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/fs/nls/mac-turkish.c b/fs/nls/mac-turkish.c
index d77e9b6b7d7c..c5415f979050 100644
--- a/fs/nls/mac-turkish.c
+++ b/fs/nls/mac-turkish.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/mac-turkish.c
  *
@@ -5,42 +6,8 @@
  * Generated automatically from the Unicode and charset
  * tables from the Unicode Organization (www.unicode.org).
  * The Unicode to charset table has only exact mappings.
- */
-
-/*
- * COPYRIGHT AND PERMISSION NOTICE
  *
- * Copyright 1991-2012 Unicode, Inc.  All rights reserved.  Distributed under
- * the Terms of Use in http://www.unicode.org/copyright.html.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of the Unicode data files and any associated documentation (the "Data
- * Files") or Unicode software and any associated documentation (the
- * "Software") to deal in the Data Files or Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Data Files or Software, and
- * to permit persons to whom the Data Files or Software are furnished to do
- * so, provided that (a) the above copyright notice(s) and this permission
- * notice appear with all copies of the Data Files or Software, (b) both the
- * above copyright notice(s) and this permission notice appear in associated
- * documentation, and (c) there is clear notice in each modified Data File or
- * in the Software as well as in the documentation associated with the Data
- * File(s) or Software that the data or software has been modified.
- *
- * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in these Data Files or Software without prior written
- * authorization of the copyright holder.
+ * Copyright 1991-2012 Unicode, Inc.  All rights reserved.
  */
 
 #include <linux/module.h>
diff --git a/fs/nls/nls_ascii.c b/fs/nls/nls_ascii.c
index 068143d71284..3c8d1c17b12f 100644
--- a/fs/nls/nls_ascii.c
+++ b/fs/nls/nls_ascii.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_ascii.c
  *
diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
index a5c3a9f1b8dc..94fb554bfaf9 100644
--- a/fs/nls/nls_base.c
+++ b/fs/nls/nls_base.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/nls/nls_base.c
  *
diff --git a/fs/nls/nls_cp1250.c b/fs/nls/nls_cp1250.c
index e22a57a4b828..68ee1c927a99 100644
--- a/fs/nls/nls_cp1250.c
+++ b/fs/nls/nls_cp1250.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp1250.c
  *
diff --git a/fs/nls/nls_cp1251.c b/fs/nls/nls_cp1251.c
index 6f46d339f23c..c6e03b7cf75f 100644
--- a/fs/nls/nls_cp1251.c
+++ b/fs/nls/nls_cp1251.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp1251.c
  *
diff --git a/fs/nls/nls_cp1255.c b/fs/nls/nls_cp1255.c
index 299e089d4301..d8506d6c9631 100644
--- a/fs/nls/nls_cp1255.c
+++ b/fs/nls/nls_cp1255.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp1255.c
  *
diff --git a/fs/nls/nls_cp437.c b/fs/nls/nls_cp437.c
index ab880499ea32..1bd7901656c2 100644
--- a/fs/nls/nls_cp437.c
+++ b/fs/nls/nls_cp437.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp437.c
  *
diff --git a/fs/nls/nls_cp737.c b/fs/nls/nls_cp737.c
index 5c37618296e9..7d8da4e529a0 100644
--- a/fs/nls/nls_cp737.c
+++ b/fs/nls/nls_cp737.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp737.c
  *
diff --git a/fs/nls/nls_cp775.c b/fs/nls/nls_cp775.c
index 51ccc908901f..312d7314bfb3 100644
--- a/fs/nls/nls_cp775.c
+++ b/fs/nls/nls_cp775.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp775.c
  *
diff --git a/fs/nls/nls_cp850.c b/fs/nls/nls_cp850.c
index 5f9b9507a8b6..56ad1f8cf5ef 100644
--- a/fs/nls/nls_cp850.c
+++ b/fs/nls/nls_cp850.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp850.c
  *
diff --git a/fs/nls/nls_cp852.c b/fs/nls/nls_cp852.c
index fc513a5e8358..2bfdf8d11e4e 100644
--- a/fs/nls/nls_cp852.c
+++ b/fs/nls/nls_cp852.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp852.c
  *
diff --git a/fs/nls/nls_cp855.c b/fs/nls/nls_cp855.c
index a43be58adb36..2dba2441bd83 100644
--- a/fs/nls/nls_cp855.c
+++ b/fs/nls/nls_cp855.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp855.c
  *
diff --git a/fs/nls/nls_cp857.c b/fs/nls/nls_cp857.c
index 772cd4195bad..5ca9b9e11b92 100644
--- a/fs/nls/nls_cp857.c
+++ b/fs/nls/nls_cp857.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp857.c
  *
diff --git a/fs/nls/nls_cp860.c b/fs/nls/nls_cp860.c
index 36cf4ca11966..5909c33d737b 100644
--- a/fs/nls/nls_cp860.c
+++ b/fs/nls/nls_cp860.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp860.c
  *
diff --git a/fs/nls/nls_cp861.c b/fs/nls/nls_cp861.c
index b7397d079f8f..7d10d1e165fa 100644
--- a/fs/nls/nls_cp861.c
+++ b/fs/nls/nls_cp861.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp861.c
  *
diff --git a/fs/nls/nls_cp862.c b/fs/nls/nls_cp862.c
index fd3b95d1e95d..0e037e00b300 100644
--- a/fs/nls/nls_cp862.c
+++ b/fs/nls/nls_cp862.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp862.c
  *
diff --git a/fs/nls/nls_cp863.c b/fs/nls/nls_cp863.c
index 813ae7944249..edf0599b3efd 100644
--- a/fs/nls/nls_cp863.c
+++ b/fs/nls/nls_cp863.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp863.c
  *
diff --git a/fs/nls/nls_cp864.c b/fs/nls/nls_cp864.c
index d9eb6d5cd47a..165dba92978b 100644
--- a/fs/nls/nls_cp864.c
+++ b/fs/nls/nls_cp864.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp864.c
  *
diff --git a/fs/nls/nls_cp865.c b/fs/nls/nls_cp865.c
index 2678ffd98bb6..ba41cbc5c11e 100644
--- a/fs/nls/nls_cp865.c
+++ b/fs/nls/nls_cp865.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp865.c
  *
diff --git a/fs/nls/nls_cp866.c b/fs/nls/nls_cp866.c
index 7e93d0a3802a..a44cceaf9001 100644
--- a/fs/nls/nls_cp866.c
+++ b/fs/nls/nls_cp866.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp866.c
  *
diff --git a/fs/nls/nls_cp869.c b/fs/nls/nls_cp869.c
index 4491737dd5cb..76eae5653cba 100644
--- a/fs/nls/nls_cp869.c
+++ b/fs/nls/nls_cp869.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp869.c
  *
diff --git a/fs/nls/nls_cp874.c b/fs/nls/nls_cp874.c
index 4fcfbf8ca72c..474764c354da 100644
--- a/fs/nls/nls_cp874.c
+++ b/fs/nls/nls_cp874.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp874.c
  *
diff --git a/fs/nls/nls_cp932.c b/fs/nls/nls_cp932.c
index e5e6270fcca6..ec14c7290057 100644
--- a/fs/nls/nls_cp932.c
+++ b/fs/nls/nls_cp932.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp932.c
  *
diff --git a/fs/nls/nls_cp936.c b/fs/nls/nls_cp936.c
index 91d0a15fd7f9..179de27f9dbd 100644
--- a/fs/nls/nls_cp936.c
+++ b/fs/nls/nls_cp936.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp936.c
  *
diff --git a/fs/nls/nls_cp949.c b/fs/nls/nls_cp949.c
index 3ae03c76d59c..47ea5145310b 100644
--- a/fs/nls/nls_cp949.c
+++ b/fs/nls/nls_cp949.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp949.c
  *
diff --git a/fs/nls/nls_cp950.c b/fs/nls/nls_cp950.c
index e968aa80198d..bc292e3b21b6 100644
--- a/fs/nls/nls_cp950.c
+++ b/fs/nls/nls_cp950.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_cp950.c
  *
diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
index 0191cc9d955e..b1dc36b6a7dc 100644
--- a/fs/nls/nls_euc-jp.c
+++ b/fs/nls/nls_euc-jp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/nls/nls_euc-jp.c
  *
diff --git a/fs/nls/nls_iso8859-1.c b/fs/nls/nls_iso8859-1.c
index a181be488f7d..eb085a11023a 100644
--- a/fs/nls/nls_iso8859-1.c
+++ b/fs/nls/nls_iso8859-1.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_iso8859-1.c
  *
diff --git a/fs/nls/nls_iso8859-13.c b/fs/nls/nls_iso8859-13.c
index 8e2be5bfeaf1..9766758c9a2e 100644
--- a/fs/nls/nls_iso8859-13.c
+++ b/fs/nls/nls_iso8859-13.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_iso8859-13.c
  *
diff --git a/fs/nls/nls_iso8859-14.c b/fs/nls/nls_iso8859-14.c
index c789eccb8a69..482ac2388f26 100644
--- a/fs/nls/nls_iso8859-14.c
+++ b/fs/nls/nls_iso8859-14.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_iso8859-14.c
  *
diff --git a/fs/nls/nls_iso8859-15.c b/fs/nls/nls_iso8859-15.c
index ffec649176fb..c7527653f36d 100644
--- a/fs/nls/nls_iso8859-15.c
+++ b/fs/nls/nls_iso8859-15.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_iso8859-15.c
  *
diff --git a/fs/nls/nls_iso8859-2.c b/fs/nls/nls_iso8859-2.c
index d352334d0314..c50e4a27137b 100644
--- a/fs/nls/nls_iso8859-2.c
+++ b/fs/nls/nls_iso8859-2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_iso8859-2.c
  *
diff --git a/fs/nls/nls_iso8859-3.c b/fs/nls/nls_iso8859-3.c
index 09990e6634d2..4ad6172051ea 100644
--- a/fs/nls/nls_iso8859-3.c
+++ b/fs/nls/nls_iso8859-3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_iso8859-3.c
  *
diff --git a/fs/nls/nls_iso8859-4.c b/fs/nls/nls_iso8859-4.c
index 92795224912e..85743b2125de 100644
--- a/fs/nls/nls_iso8859-4.c
+++ b/fs/nls/nls_iso8859-4.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_iso8859-4.c
  *
diff --git a/fs/nls/nls_iso8859-5.c b/fs/nls/nls_iso8859-5.c
index 32309315307a..da8ce2e87329 100644
--- a/fs/nls/nls_iso8859-5.c
+++ b/fs/nls/nls_iso8859-5.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_iso8859-5.c
  *
diff --git a/fs/nls/nls_iso8859-6.c b/fs/nls/nls_iso8859-6.c
index c18183469d2a..73a25c3f814e 100644
--- a/fs/nls/nls_iso8859-6.c
+++ b/fs/nls/nls_iso8859-6.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_iso8859-6.c
  *
diff --git a/fs/nls/nls_iso8859-7.c b/fs/nls/nls_iso8859-7.c
index 3652d6832864..0d6210823bed 100644
--- a/fs/nls/nls_iso8859-7.c
+++ b/fs/nls/nls_iso8859-7.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_iso8859-7.c
  *
diff --git a/fs/nls/nls_iso8859-9.c b/fs/nls/nls_iso8859-9.c
index 11a67834b855..35db1163bc5d 100644
--- a/fs/nls/nls_iso8859-9.c
+++ b/fs/nls/nls_iso8859-9.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_iso8859-9.c
  *
diff --git a/fs/nls/nls_koi8-r.c b/fs/nls/nls_koi8-r.c
index e3dca27a3803..4203158f6912 100644
--- a/fs/nls/nls_koi8-r.c
+++ b/fs/nls/nls_koi8-r.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_koi8-r.c
  *
diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
index 07afcd9e58c0..1eef891c5428 100644
--- a/fs/nls/nls_koi8-ru.c
+++ b/fs/nls/nls_koi8-ru.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_koi8-ru.c
  *
diff --git a/fs/nls/nls_koi8-u.c b/fs/nls/nls_koi8-u.c
index f60645758c1a..df2a05a932ca 100644
--- a/fs/nls/nls_koi8-u.c
+++ b/fs/nls/nls_koi8-u.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Unicode-3.0 AND GPL-2.0
 /*
  * linux/fs/nls/nls_koi8-u.c
  *
diff --git a/fs/nls/nls_utf8.c b/fs/nls/nls_utf8.c
index a0fa0610eaac..db3065bb4a3e 100644
--- a/fs/nls/nls_utf8.c
+++ b/fs/nls/nls_utf8.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Module for handling utf8 just like any other charset.
  * By Urban Widmark 2000
-- 
2.43.0


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] fs/nls: Add SPDX ID lines to files
  2026-06-11 19:36 [PATCH] fs/nls: Add SPDX ID lines to files Tim Bird
@ 2026-06-11 20:41 ` Richard Fontana
  2026-06-11 22:19   ` Bird, Tim
  0 siblings, 1 reply; 3+ messages in thread
From: Richard Fontana @ 2026-06-11 20:41 UTC (permalink / raw)
  To: Tim Bird; +Cc: tglx, gregkh, phcoder, hirofumi, linux-spdx, linux-kernel

On Thu, Jun 11, 2026 at 3:37 PM Tim Bird <tim.bird@sony.com> wrote:
>
> Almost all the files in the fs/nls directory are missing
> SPDX-License-Identifier lines.  Add the Unicode-3.0 license to
> LICENSES/preferred, and reference that in the ID lines for
> the pertinent files.
>
> Many of these source files were introduced in 1997 by
> Gordon Chafee, who states that data tables were automatically
> generated from materials on the www.unicode.org web site.
> This pre-dates when that site had an explicit license, and
> these files are missing any license text.
>
> Files starting with 'mac-' prefix were added in 2012 by
> Vladimir Serbinenko.  These files have an earlier Unicode license
> with slight differences from the current license that is preferred by
> Unicode, Inc.
>
> Use the current Unicode license (Unicode-3.0) (in conjunction with
> GPL-2.0) for all files that have data that was obtained from Unicode, Inc.
> Use 'GPL-2.0' as the license ID for other files.

I might be misunderstanding but, at least where there was an explicit
license notice, and assuming the Unicode mapping stuff even requires a
license why not use an SPDX identifier for the legacy Unicode license
(assuming it exists as an SPDX identifier, I haven't actually
checked)? In other words, it seems like you're making a legal
conclusion here that Unicode-3.0 is a valid license for what was
previously either not explicitly licensed or was under a different
Unicode license. I can see how that might be the case, but it doesn't
seem to *necessarily* be the case.

Richard


^ permalink raw reply	[flat|nested] 3+ messages in thread

* RE: [PATCH] fs/nls: Add SPDX ID lines to files
  2026-06-11 20:41 ` Richard Fontana
@ 2026-06-11 22:19   ` Bird, Tim
  0 siblings, 0 replies; 3+ messages in thread
From: Bird, Tim @ 2026-06-11 22:19 UTC (permalink / raw)
  To: Richard Fontana; +Cc: tglx, gregkh, phcoder, hirofumi, linux-spdx, linux-kernel

> -----Original Message-----
> From: Richard Fontana <rfontana@redhat.com>
> On Thu, Jun 11, 2026 at 3:37 PM Tim Bird <tim.bird@sony.com> wrote:
> >
> > Almost all the files in the fs/nls directory are missing
> > SPDX-License-Identifier lines.  Add the Unicode-3.0 license to
> > LICENSES/preferred, and reference that in the ID lines for
> > the pertinent files.
> >
> > Many of these source files were introduced in 1997 by
> > Gordon Chafee, who states that data tables were automatically
> > generated from materials on the www.unicode.org web site.
> > This pre-dates when that site had an explicit license, and
> > these files are missing any license text.
> >
> > Files starting with 'mac-' prefix were added in 2012 by
> > Vladimir Serbinenko.  These files have an earlier Unicode license
> > with slight differences from the current license that is preferred by
> > Unicode, Inc.
> >
> > Use the current Unicode license (Unicode-3.0) (in conjunction with
> > GPL-2.0) for all files that have data that was obtained from Unicode, Inc.
> > Use 'GPL-2.0' as the license ID for other files.
> 
> I might be misunderstanding but, at least where there was an explicit
> license notice, and assuming the Unicode mapping stuff even requires a
> license why not use an SPDX identifier for the legacy Unicode license
> (assuming it exists as an SPDX identifier, I haven't actually
> checked)? In other words, it seems like you're making a legal
> conclusion here that Unicode-3.0 is a valid license for what was
> previously either not explicitly licensed or was under a different
> Unicode license. I can see how that might be the case, but it doesn't
> seem to *necessarily* be the case.

There is an existing SPDX identifier for the text in the fs/nls/mac-*.c files.
It can be found here:
https://spdx.org/licenses/Unicode-DFS-2015.html

There are 4 major categories of files in the fs/nls directory:
 - files contributed in 1997, that don't have any license text, but do
   carry a notice that they were derived from www.unicode.org
 - files contributed in 2012, which have text which exactly
    matches the 2015 Unicode license.  (Presumably it was in place
    in 2012 when it was copied into kernel files, and no time travel was
    involved.)
- files contributed at other times, which appear to have Unicode, Inc.
   data in them (most of which carry a notice that they were derived from www.unicode.org)
 - files contributed at other times, that don't appear to have data
    from Unicocde, Inc. (e.g. Shift-JIS tables in fs/nls/nls_euc-jp.c)

None of the source files in the kernel have changed Unicode data points
since 2012. If I was to do some 'clean-room' rebuilding of these files from
current data from the Unicode web site (www.unicode.org), I am confident
I would get the same data tables that we have in the current code.

The '2015' Unicode license is no longer used by Unicode, Inc, and I presume
that they would be satisfied if we used their current (Unicode-3.0) license.
They removed clause (c) sometime between 2015 and 2016.  See:
https://spdx.org/licenses/Unicode-DFS-2015.html,
https://spdx.org/licenses/Unicode-DFS-2016.html, and
https://spdx.org/licenses/Unicode-3.0.html

The difference between the 2016 license and the 3.0 license is reordering
some items (putting the 'COPYRIGHT AND PERMISSION NOTICE', and the copyright
line itself above the license text), and some white space changes (putting clauses
a and b inline, instead of as separate bullets).

The current Unicode 3.0 license is more permissive than the '2015' license,
but more strict than not having a license (what they were doing in 1997).

I'd rather not add multiple license files (under LICENSES/preferred) for data
that would be equivalent if I rebuilt (in the present) these source files using
data from the same organization that they originally came from.  IOW,
I'd rather treat the 'Unicode-3.0' license as the Unicode, Inc. preferred license,
and apply that, rather than carry multiple old license versions around in the
kernel source tree.  Unicode, Inc. doesn't even do that.

My opinion would be different if there were any other copyright holders for
the data in question who might have different preferences for the clauses/terms
they would like to see in effect (as is the case with  BSD variants).  But the
Unicode Inc. preference in this case seems clear.

 -- Tim


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2026-06-11 22:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-11 19:36 [PATCH] fs/nls: Add SPDX ID lines to files Tim Bird
2026-06-11 20:41 ` Richard Fontana
2026-06-11 22:19   ` Bird, Tim

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®