Skip to content

Commit 5bba5c9

Browse files
committed
Merge tag 'spdx-5.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx
Pull SPDX fixes from Greg KH: "Here are four small SPDX fixes for 5.3-rc5. A few style fixes for some SPDX comments, added an SPDX tag for one file, and fix up some GPL boilerplate for another file. All of these have been in linux-next for a few weeks with no reported issues (they are comment changes only, so that's to be expected...)" * tag 'spdx-5.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx: i2c: stm32: Use the correct style for SPDX License Identifier intel_th: Use the correct style for SPDX License Identifier coccinelle: api/atomic_as_refcounter: add SPDX License Identifier kernel/configs: Replace GPL boilerplate code with SPDX identifier
2 parents 4503c0a + 0dda590 commit 5bba5c9

File tree

4 files changed

+4
-17
lines changed

4 files changed

+4
-17
lines changed

drivers/hwtracing/intel_th/msu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: GPL-2.0
1+
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
33
* Intel(R) Trace Hub Memory Storage Unit (MSU) data structures
44
*

drivers/hwtracing/intel_th/pti.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: GPL-2.0
1+
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
33
* Intel(R) Trace Hub PTI output data structures
44
*

kernel/configs.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// SPDX-License-Identifier: GPL-2.0-or-later
12
/*
23
* kernel/configs.c
34
* Echo the kernel .config file used to build the kernel
@@ -6,21 +7,6 @@
67
* Copyright (C) 2002 Randy Dunlap <[email protected]>
78
* Copyright (C) 2002 Al Stone <[email protected]>
89
* Copyright (C) 2002 Hewlett-Packard Company
9-
*
10-
* This program is free software; you can redistribute it and/or modify
11-
* it under the terms of the GNU General Public License as published by
12-
* the Free Software Foundation; either version 2 of the License, or (at
13-
* your option) any later version.
14-
*
15-
* This program is distributed in the hope that it will be useful, but
16-
* WITHOUT ANY WARRANTY; without even the implied warranty of
17-
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
18-
* NON INFRINGEMENT. See the GNU General Public License for more
19-
* details.
20-
*
21-
* You should have received a copy of the GNU General Public License
22-
* along with this program; if not, write to the Free Software
23-
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
2410
*/
2511

2612
#include <linux/kernel.h>

scripts/coccinelle/api/atomic_as_refcounter.cocci

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
12
// Check if refcount_t type and API should be used
23
// instead of atomic_t type when dealing with refcounters
34
//

0 commit comments

Comments
 (0)