Merge tag 'x86_cc_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Mar 2022 18:38:53 +0000 (11:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Mar 2022 18:38:53 +0000 (11:38 -0700)
commit6b9bfb1365f40f14b1ad908c44dff61672c6404a
treec11c726a02de75ca3eea97d76c1bbf3394778050
parent61e2658e37b3c0c7c82aab84f4cc162e1b90f6ca
parent1e8c5971c249893ac33ca983c32bafcf5d50c727
Merge tag 'x86_cc_for_v5.18_rc1' of git://git./linux/kernel/git/tip/tip

Pull x86 confidential computing updates from Borislav Petkov:

 - Add shared confidential computing code which will be used by both
   vendors instead of proliferating home-grown solutions for
   technologies (SEV/SNP and TDX) which are pretty similar

* tag 'x86_cc_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm/cpa: Generalize __set_memory_enc_pgtable()
  x86/coco: Add API to handle encryption mask
  x86/coco: Explicitly declare type of confidential computing platform
  x86/cc: Move arch/x86/{kernel/cc_platform.c => coco/core.c}