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

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>

2020-04-13 09:44:39 +02:00

..

.gitignore

.gitignore: add SPDX License Identifier

2020-03-25 11:50:48 +01:00

bioscall.S

x86, realmode: flattened rm hierachy

2012-05-08 11:48:45 -07:00

copy.S

x86, realmode: flattened rm hierachy

2012-05-08 11:48:45 -07:00

header.S

x86/asm/realmode: Use SYM_DATA_* instead of GLOBAL

2019-10-18 11:28:47 +02:00

Makefile

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

2020-04-13 09:44:39 +02:00

realmode.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

realmode.lds.S

x86/vmlinux: Drop unneeded linker script discard of .eh_frame

2020-02-25 14:51:29 +01:00

reboot.S

x86/asm/64: Add ENDs to some functions and relabel with SYM_CODE_*

2019-10-18 11:58:16 +02:00

regs.c

x86, realmode: flattened rm hierachy

2012-05-08 11:48:45 -07:00

stack.S

x86/asm/realmode: Use SYM_DATA_* instead of GLOBAL

2019-10-18 11:28:47 +02:00

trampoline_32.S

x86/asm/32: Add ENDs to some functions and relabel with SYM_CODE_*

2019-10-18 11:58:33 +02:00

trampoline_64.S

x86/asm/64: Add ENDs to some functions and relabel with SYM_CODE_*

2019-10-18 11:58:16 +02:00

trampoline_common.S

x86/asm/realmode: Use SYM_DATA_* instead of GLOBAL

2019-10-18 11:28:47 +02:00

video-bios.c

x86, realmode: flattened rm hierachy

2012-05-08 11:48:45 -07:00

video-mode.c

x86, realmode: flattened rm hierachy

2012-05-08 11:48:45 -07:00

video-vesa.c

x86, realmode: flattened rm hierachy

2012-05-08 11:48:45 -07:00

video-vga.c

x86, realmode: flattened rm hierachy

2012-05-08 11:48:45 -07:00

wakemain.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

wakeup_asm.S

x86/asm/64: Add ENDs to some functions and relabel with SYM_CODE_*

2019-10-18 11:58:16 +02:00

wakeup.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00