Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bba5c9c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4503c0a4 0dda5907

drivers/hwtracing/intel_th/msu.h

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Intel(R) Trace Hub Memory Storage Unit (MSU) data structures

 *

drivers/hwtracing/intel_th/pti.h

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Intel(R) Trace Hub PTI output data structures

 *

kernel/configs.c

+1 −15
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * kernel/configs.c

 * Echo the kernel .config file used to build the kernel
@@ -6,21 +7,6 @@ 
 * Copyright (C) 2002 Randy Dunlap <rdunlap@xenotime.net>

 * Copyright (C) 2002 Al Stone <ahs3@fc.hp.com>

 * Copyright (C) 2002 Hewlett-Packard Company

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or (at

 * your option) any later version.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or

 * NON INFRINGEMENT.  See the GNU General Public License for more

 * details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */



#include <linux/kernel.h>

scripts/coccinelle/api/atomic_as_refcounter.cocci

+1 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

// Check if refcount_t type and API should be used

// instead of atomic_t type when dealing with refcounters

//