From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Dec 2019 22:20:21 +0000 (-0800)
Subject: Merge tag 'spdx-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v5.5-rc1~53
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/388c645a33a739bb96aa5ffe283ec68786ea7890?hp=-c

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
---

388c645a33a739bb96aa5ffe283ec68786ea7890
diff --combined include/asm-generic/export.h
index a3983e2ce0fd,d0166115a825..afddc5442e92
--- a/include/asm-generic/export.h
+++ b/include/asm-generic/export.h
@@@ -1,3 -1,4 +1,4 @@@
+ /* SPDX-License-Identifier: GPL-2.0-only */
  #ifndef __ASM_GENERIC_EXPORT_H
  #define __ASM_GENERIC_EXPORT_H
  
@@@ -31,6 -32,7 +32,6 @@@
   */
  .macro ___EXPORT_SYMBOL name,val,sec
  #ifdef CONFIG_MODULES
 -	.globl __ksymtab_\name
  	.section ___ksymtab\sec+\name,"a"
  	.balign KSYM_ALIGN
  __ksymtab_\name:
@@@ -43,6 -45,7 +44,6 @@@ __kstrtab_\name
  #ifdef CONFIG_MODVERSIONS
  	.section ___kcrctab\sec+\name,"a"
  	.balign KCRC_ALIGN
 -__kcrctab_\name:
  #if defined(CONFIG_MODULE_REL_CRCS)
  	.long __crc_\name - .
  #else