Ingo Molnar 2e2bc42c83 Merge branch 'linus' into x86/boot, to resolve conflict ... There's a new conflict with Linus's upstream tree, because in the following merge conflict resolution in <asm/coco.h>: 38b334fc76 Merge tag 'x86_sev_for_v6.9_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Linus has resolved the conflicting placement of 'cc_mask' better than the original commit: 1c811d403a x86/sev: Fix position dependent variable references in startup code ... which was also done by an internal merge resolution: 2e5fc4786b Merge branch 'x86/sev' into x86/boot, to resolve conflicts and to pick up dependent tree But Linus is right in 38b334fc76, the 'cc_mask' declaration is sufficient within the #ifdef CONFIG_ARCH_HAS_CC_PLATFORM block. So instead of forcing Linus to do the same resolution again, merge in Linus's tree and follow his conflict resolution. Conflicts: arch/x86/include/asm/coco.h Signed-off-by: Ingo Molnar <mingo@kernel.org>		2024-03-12 09:55:57 +01:00
..
compressed	Merge branch 'linus' into x86/boot, to resolve conflict	2024-03-12 09:55:57 +01:00
tools	x86/boot: Increase section and file alignment to 4k/512	2023-09-17 19:48:44 +02:00
.gitignore	x86/boot: Modernize genimage script; hdimage+EFI support	2021-05-10 12:27:50 +02:00
a20.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497	2019-06-19 17:09:53 +02:00
apm.c	x86/boot: Fix comment spelling	2020-03-17 20:52:52 +01:00
bioscall.S	x86/boot: Avoid using Intel mnemonics in AT&T syntax asm	2023-01-10 13:03:23 +01:00
bitops.h	x86/boot: Remove superfluous type casting from arch/x86/boot/bitops.h	2022-08-15 19:17:43 +02:00
boot.h	- Add a "make x86_debug.config" target which enables a bunch of useful	2022-05-23 18:15:44 -07:00
cmdline.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
copy.S	x86/asm: Do not annotate functions with GLOBAL	2019-10-18 11:25:58 +02:00
cpu.c	x86/cpu: Remove X86_FEATURE_NAMES	2023-05-15 20:03:08 +02:00
cpucheck.c	x86/boot: Use MSR read/write helpers instead of inline assembly	2022-04-06 13:02:13 +02:00
cpuflags.c	x86/boot: Remove x86_32 PIC using %ebx workaround	2022-11-29 16:26:53 +01:00
cpuflags.h	x86/tdx: Detect TDX at early kernel decompression time	2022-04-07 08:27:51 -07:00
ctype.h
early_serial_console.c	x86: Clean up 'sizeof x' => 'sizeof(x)'	2018-10-29 07:13:28 +01:00
edd.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497	2019-06-19 17:09:53 +02:00
genimage.sh	x86/boot: Fix make hdimage with older versions of mtools	2021-09-29 11:06:47 +02:00
header.S	efi/x86: Set the PE/COFF header's NX compat flag unconditionally	2024-02-28 14:23:55 +01:00
install.sh	kbuild: factor out the common installation code into scripts/install.sh	2022-05-11 21:45:53 +09:00
io.h	x86/boot: Port I/O: Allow to hook up alternative helpers	2022-04-07 08:27:52 -07:00
main.c	- Add a "make x86_debug.config" target which enables a bunch of useful	2022-05-23 18:15:44 -07:00
Makefile	x86/boot: Split off PE/COFF .data section	2023-09-17 19:48:43 +02:00
memory.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497	2019-06-19 17:09:53 +02:00
mkcpustr.c	x86/cpu: Print VMX flags in /proc/cpuinfo using VMX_FEATURES_*	2020-01-13 18:36:02 +01:00
msr.h	x86/boot: Introduce helpers for MSR reads/writes	2022-04-06 12:59:17 +02:00
mtools.conf.in	x86/boot: Fix make hdimage with older versions of mtools	2021-09-29 11:06:47 +02:00
pm.c	x86/asm: Always set A (accessed) flag in GDT descriptors	2023-12-20 10:57:51 +01:00
pmjump.S	x86/asm: Do not annotate functions with GLOBAL	2019-10-18 11:25:58 +02:00
printf.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497	2019-06-19 17:09:53 +02:00
regs.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 83	2019-05-24 17:37:52 +02:00
setup.ld	x86/efistub: Use 1:1 file:memory mapping for PE/COFF .compat section	2024-02-05 10:24:51 +00:00
string.c	x86/boot: Remove redundant initialization of the 'delta' variable in strcmp()	2023-12-20 22:23:33 +01:00
string.h	x86/boot/string: Add missing function prototypes	2021-12-10 19:49:06 +01:00
tty.c	treewide: Convert macro and uses of __section(foo) to __section("foo")	2020-10-25 14:51:49 -07:00
version.c	kbuild: build init/built-in.a just once	2022-09-29 04:40:15 +09:00
vesa.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 48	2019-05-24 17:27:13 +02:00
video-bios.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497	2019-06-19 17:09:53 +02:00
video-mode.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497	2019-06-19 17:09:53 +02:00
video-vesa.c	sysfb: Enable boot time VESA graphic mode selection	2022-03-04 20:55:33 +01:00
video-vga.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497	2019-06-19 17:09:53 +02:00
video.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 497	2019-06-19 17:09:53 +02:00
video.h	treewide: Convert macro and uses of __section(foo) to __section("foo")	2020-10-25 14:51:49 -07:00