From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Mar 2022 18:38:53 +0000 (-0700)
Subject: Merge tag 'x86_cc_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6b9bfb1365f40f14b1ad908c44dff61672c6404a;p=linux.git

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}
---

6b9bfb1365f40f14b1ad908c44dff61672c6404a