mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-01-22 11:04:50 -05:00
2e2bc42c83
There's a new conflict with Linus's upstream tree, because in the following merge conflict resolution in <asm/coco.h>:38b334fc76Merge 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:1c811d403ax86/sev: Fix position dependent variable references in startup code ... which was also done by an internal merge resolution:2e5fc4786bMerge branch 'x86/sev' into x86/boot, to resolve conflicts and to pick up dependent tree But Linus is right in38b334fc76, 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>