linux-next: manual merge of the tip tree with the kvm-fixes tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/x86/kernel/asm-offsets.c

between commit:

  debc5a1ec0d1 ("KVM: x86: use a separate asm-offsets.c file")

from the kvm-fixes tree and commits:

  c063a217bc07 ("x86/percpu: Move current_top_of_stack next to current_task")
  5d8213864ade ("x86/retbleed: Add SKL return thunk")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/kernel/asm-offsets.c
index 437308004ef2,13afdbbee349..000000000000
--- a/arch/x86/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets.c
@@@ -107,4 -108,14 +107,9 @@@ static void __used common(void
  	OFFSET(TSS_sp0, tss_struct, x86_tss.sp0);
  	OFFSET(TSS_sp1, tss_struct, x86_tss.sp1);
  	OFFSET(TSS_sp2, tss_struct, x86_tss.sp2);
+ 
+ 	OFFSET(X86_top_of_stack, pcpu_hot, top_of_stack);
+ #ifdef CONFIG_CALL_DEPTH_TRACKING
+ 	OFFSET(X86_call_depth, pcpu_hot, call_depth);
+ #endif
 -
 -	if (IS_ENABLED(CONFIG_KVM_INTEL)) {
 -		BLANK();
 -		OFFSET(VMX_spec_ctrl, vcpu_vmx, spec_ctrl);
 -	}
  }

Attachment: pgpsxGKewNA0V.pgp
Description: OpenPGP digital signature