diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-02 10:22:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-02 10:22:38 -0700 |
| commit | a68dc6188242e1cc6f72eb3361e71633b4bc02a7 (patch) | |
| tree | 0b4d0e5aacde520f9f4b3751c984118888ba88b9 | |
| parent | 460b48a0fefce25beb0fc0139e721c5691d65d7f (diff) | |
| parent | 8e82fe2ab65a80b1526b285c661ab88cc5891e3a (diff) | |
Merge tag 'spdx-5.2-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/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
| -rw-r--r-- | arch/arm/kernel/bugs.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/ux500/cryp/Makefile | 2 | ||||
| -rw-r--r-- | drivers/phy/st/phy-stm32-usbphyc.c | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 2 | ||||
| -rw-r--r-- | lib/test_stackinit.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/max9759.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/kernel/bugs.c b/arch/arm/kernel/bugs.c index d41d3598e5e54..14c8dbbb7d2df 100644 --- a/arch/arm/kernel/bugs.c +++ b/arch/arm/kernel/bugs.c @@ -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> diff --git a/drivers/crypto/ux500/cryp/Makefile b/drivers/crypto/ux500/cryp/Makefile index a90b50597e5cc..3e67531f484cd 100644 --- a/drivers/crypto/ux500/cryp/Makefile +++ b/drivers/crypto/ux500/cryp/Makefile @@ -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 diff --git a/drivers/phy/st/phy-stm32-usbphyc.c b/drivers/phy/st/phy-stm32-usbphyc.c index 1255cd1d9a60c..56bdea4b0bd90 100644 --- a/drivers/phy/st/phy-stm32-usbphyc.c +++ b/drivers/phy/st/phy-stm32-usbphyc.c @@ -1,4 +1,4 @@ -// SPDX-Licence-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 /* * STMicroelectronics STM32 USB PHY Controller driver * diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77980.c b/drivers/pinctrl/sh-pfc/pfc-r8a77980.c index 473da65890a70..9ed4ead2dafb3 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a77980.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a77980.c @@ -1,4 +1,4 @@ -// SPDX-Lincense-Identifier: GPL 2.0 +// SPDX-License-Identifier: GPL-2.0 /* * R8A77980 processor support - PFC hardware block. * diff --git a/lib/test_stackinit.c b/lib/test_stackinit.c index 13115b6f2b88f..e97dc54b4fdf3 100644 --- a/lib/test_stackinit.c +++ b/lib/test_stackinit.c @@ -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*. diff --git a/sound/soc/codecs/max9759.c b/sound/soc/codecs/max9759.c index ecfb4a80424bc..00e9d4fd1651f 100644 --- a/sound/soc/codecs/max9759.c +++ b/sound/soc/codecs/max9759.c @@ -1,4 +1,4 @@ -// SPDX-Licence-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 /* * MAX9759 Amplifier Driver * |