Skip to content

Commit

Permalink
Merge tag 'spdx-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/gregkh/spdx

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
  • Loading branch information
torvalds committed Dec 3, 2019
2 parents 537bd0a + bf49d9d commit 388c645
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions include/asm-generic/export.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef __ASM_GENERIC_EXPORT_H
#define __ASM_GENERIC_EXPORT_H

Expand Down
1 change: 1 addition & 0 deletions include/linux/export.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef _LINUX_EXPORT_H
#define _LINUX_EXPORT_H

Expand Down
1 change: 1 addition & 0 deletions include/linux/license.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef __LICENSE_H
#define __LICENSE_H

Expand Down
7 changes: 5 additions & 2 deletions include/linux/module.h
Original file line number Diff line number Diff line change
@@ -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>
Expand Down

0 comments on commit 388c645

Please sign in to comment.