Skip to contentSkip to conversation

x86 license updates

GIT PULL Merged Ingo Molnar 2 participants 2 messages Oct 12, 2019 x86

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest core-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus

# HEAD: 6184488a19be96d89cb6c36fb4bc277198309484 x86: Use the correct SPDX License Identifier in headers

Fix a couple of SPDX tags in x86 headers to follow the canonical pattern.

Thanks,

Ingo

------------------>
Nishad Kamdar (1):
x86: Use the correct SPDX License Identifier in headers

 arch/x86/include/asm/cpu_entry_area.h | 2 +-
 arch/x86/include/asm/pti.h            | 2 +-
 arch/x86/kernel/process.h             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/include/asm/cpu_entry_area.h +1 -1
index cff3f3f3bfe0..8348f7d69fd5 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef _ASM_X86_CPU_ENTRY_AREA_H
 #define _ASM_X86_CPU_ENTRY_AREA_H
arch/x86/include/asm/pti.h +1 -1
index 5df09a0b80b8..07375b476c4f 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PTI_H
 #define _ASM_X86_PTI_H
 #ifndef __ASSEMBLY__
arch/x86/kernel/process.h +1 -1
index 320ab978fb1f..1d0797b2338a 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 //
 // Code shared between 32 and 64 bit
 
merge bot Merged
#1 lore raw
The pull request you sent on Sat, 12 Oct 2019 13:52:57 +0200:

The pull request you sent on Sat, 12 Oct 2019 13:52:57 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/e9ec3588a9372dfb9b04afcddb199ad9e2be0044

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker