xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linus' into x86/asm, to pick up fixes and resolve conflicts

Browse Source 
Conflicts:
	arch/x86/kernel/cpu/Makefile

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2017-11-07 10:53:06 +01:00
parent c7da092a1f e4880bc5df
commit b3d9a13681
12797 changed files with 14069 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/objtool/Makefile
View File

@@ -1,3 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
include ../scripts/Makefile.include
include ../scripts/Makefile.arch

1
tools/objtool/arch/x86/insn/gen-insn-attr-x86.awk
View File

@@ -1,4 +1,5 @@
#!/bin/awk -f
# SPDX-License-Identifier: GPL-2.0
# gen-insn-attr-x86.awk: Instruction attribute table generator
# Written by Masami Hiramatsu <mhiramat@redhat.com>
#