Skip to content

Commit

Permalink
Merge tag 'spdx-5.2-rc3-2' of git://git.kernel.org/pub/scm/linux/kern…
Browse files Browse the repository at this point in the history
…el/git/gregkh/driver-core

Pull SPDX fixes from Greg KH:
 "Here are just two small patches, that fix up some found SPDX
  identifier issues.

  The first patch fixes an error in a previous SPDX fixup patch, that
  causes build errors when doing 'make clean' on the tree (the fact that
  almost no one noticed it reflects the fact that kernel developers
  don't like doing that option very often...)

  The second patch fixes up a number of places in the tree where people
  mistyped the string "SPDX-License-Identifier". Given that people can
  not even type their own name all the time without mistakes, this was
  bound to happen, and odds are, we will have to add some type of check
  for this to checkpatch.pl to catch this happening in the future.

  Both of these have passed testing by 0-day"

* tag 'spdx-5.2-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  treewide: fix typos of SPDX-License-Identifier
  crypto: ux500 - fix license comment syntax error
  • Loading branch information
Linus Torvalds committed Jun 2, 2019
2 parents 460b48a + 8e82fe2 commit a68dc61
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion arch/arm/kernel/bugs.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-Identifier: GPL-2.0
// SPDX-License-Identifier: GPL-2.0
#include <linux/init.h>
#include <asm/bugs.h>
#include <asm/proc-fns.h>
Expand Down
2 changes: 1 addition & 1 deletion drivers/crypto/ux500/cryp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#/*
# * Copyright (C) ST-Ericsson SA 2010
# * Author: shujuan.chen@stericsson.com for ST-Ericsson.
*/
# */

ccflags-$(CONFIG_CRYPTO_DEV_UX500_DEBUG) += -DDEBUG

Expand Down
2 changes: 1 addition & 1 deletion drivers/phy/st/phy-stm32-usbphyc.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-Licence-Identifier: GPL-2.0
// SPDX-License-Identifier: GPL-2.0
/*
* STMicroelectronics STM32 USB PHY Controller driver
*
Expand Down
2 changes: 1 addition & 1 deletion drivers/pinctrl/sh-pfc/pfc-r8a77980.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-Lincense-Identifier: GPL 2.0
// SPDX-License-Identifier: GPL-2.0
/*
* R8A77980 processor support - PFC hardware block.
*
Expand Down
2 changes: 1 addition & 1 deletion lib/test_stackinit.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-Licenses: GPLv2
// SPDX-License-Identifier: GPL-2.0
/*
* Test cases for compiler-based stack variable zeroing via future
* compiler flags or CONFIG_GCC_PLUGIN_STRUCTLEAK*.
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/max9759.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-Licence-Identifier: GPL-2.0
// SPDX-License-Identifier: GPL-2.0
/*
* MAX9759 Amplifier Driver
*
Expand Down

0 comments on commit a68dc61

Please sign in to comment.