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

Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refresh

Browse Source 
Resolve these conflicts:

	arch/x86/Kconfig
	arch/x86/kernel/Makefile

Do a minor "evil merge" to move the KCSAN entry up a bit by a few lines
in the Kconfig to reduce the probability of future conflicts.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2020-04-13 09:44:39 +02:00
parent f5d2313bd3 8f3d9f3542
commit 3b02a051d2
10808 changed files with 507021 additions and 241301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/realmode/rm/.gitignore vendored
View File

@@ -1,3 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
pasyms.h
realmode.lds
realmode.relocs

1
arch/x86/realmode/rm/Makefile
View File

@@ -74,5 +74,6 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
KBUILD_CFLAGS := $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
-I$(srctree)/arch/x86/boot
KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
KBUILD_CFLAGS += -fno-asynchronous-unwind-tables
GCOV_PROFILE := n
UBSAN_SANITIZE := n

1
arch/x86/realmode/rm/realmode.lds.S
View File

@@ -71,7 +71,6 @@ SECTIONS
/DISCARD/ : {
*(.note*)
*(.debug*)
*(.eh_frame*)
}
#include "pasyms.h"