History

Merge tag 'spdx-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/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

Linus Torvalds committed 6 years ago

Commit 388c6452 parents 537bd0a bf49d9d4 files · +8 −2Browse files

Showing the changes to include/linux (3 of 4 files). Show all

Unified · Split

3 files
  1. include/linux/export.h +1 −0
  2. include/linux/license.h +1 −0
  3. include/linux/module.h +5 −2
include/linux/export.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0-only */
1#ifndef _LINUX_EXPORT_H2#ifndef _LINUX_EXPORT_H
2#define _LINUX_EXPORT_H3#define _LINUX_EXPORT_H
3 4
include/linux/license.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0-only */
1#ifndef __LICENSE_H2#ifndef __LICENSE_H
2#define __LICENSE_H3#define __LICENSE_H
3 4
include/linux/module.h+5−2
@@ -1,11 +1,14 @@
1#ifndef _LINUX_MODULE_H1/* SPDX-License-Identifier: GPL-2.0-only */
2#define _LINUX_MODULE_H
3/*2/*
4 * Dynamic loading of modules into the kernel.3 * Dynamic loading of modules into the kernel.
5 *4 *
6 * Rewritten by Richard Henderson <rth@tamu.edu> Dec 19965 * Rewritten by Richard Henderson <rth@tamu.edu> Dec 1996
7 * Rewritten again by Rusty Russell, 20026 * Rewritten again by Rusty Russell, 2002
8 */7 */
8
9#ifndef _LINUX_MODULE_H
10#define _LINUX_MODULE_H
11
9#include <linux/list.h>12#include <linux/list.h>
10#include <linux/stat.h>13#include <linux/stat.h>
11#include <linux/compiler.h>14#include <linux/compiler.h>

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t