projects/linux·commit 388c645a

Merge tag 'spdx-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx

388c645a · Linus Torvalds <[email protected]> · 2019-12-03 14:20:21 -08:00

Pull SPDX fix from Greg KH:
 "Here is a single SPDX fixup for 5.5-rc1

  It resolves an issue where we had missed a few .h files with the
  auto-tagging scripts because they had "GPL" text in strings within the
  file themselves. This single patch fixes up the issue and provides the
  proper SPDX tags at the top of them as needed.

  This patch has been in linux-next for many many weeks now with no
  reported issues"

* tag 'spdx-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx:
  export,module: add SPDX GPL-2.0 license identifier to headers with no license
Commit
388c645a33a739bb96aa5ffe283ec68786ea7890
Parents
537bd0a1 · bf49d9dd

Merge commit. Changes below are compared with the first parent: 537bd0a1.

Changes

4 files changed · +8 −2

FileStatusAddDelContent
include/asm-generic/export.hmodified+1−0View file
include/linux/export.hmodified+1−0View file
include/linux/license.hmodified+1−0View file
include/linux/module.hmodified+5−2View file

include/asm-generic/export.h

View file
diff --git a/include/asm-generic/export.h b/include/asm-generic/export.h
index a3983e2..afddc54 100644
--- a/include/asm-generic/export.h
+++ b/include/asm-generic/export.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef __ASM_GENERIC_EXPORT_H
#define __ASM_GENERIC_EXPORT_H

include/linux/export.h

View file
diff --git a/include/linux/export.h b/include/linux/export.h
index 941d075..aee5c86 100644
--- a/include/linux/export.h
+++ b/include/linux/export.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef _LINUX_EXPORT_H
#define _LINUX_EXPORT_H

include/linux/license.h

View file
diff --git a/include/linux/license.h b/include/linux/license.h
index decdbf4..7cce390 100644
--- a/include/linux/license.h
+++ b/include/linux/license.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef __LICENSE_H
#define __LICENSE_H

include/linux/module.h

View file
diff --git a/include/linux/module.h b/include/linux/module.h
index 6d20895..bd165ba 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -1,11 +1,14 @@
-#ifndef _LINUX_MODULE_H
-#define _LINUX_MODULE_H
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Dynamic loading of modules into the kernel.
*
* Rewritten by Richard Henderson <[email protected]> Dec 1996
* Rewritten again by Rusty Russell, 2002
*/
+
+#ifndef _LINUX_MODULE_H
+#define _LINUX_MODULE_H
+
#include <linux/list.h>
#include <linux/stat.h>
#include <linux/compiler.h>