]> Git Repo - linux.git/commitdiff
Merge remote-tracking branch 'tip/x86/sev' into hyperv-next
authorWei Liu <[email protected]>
Mon, 17 Apr 2023 19:18:13 +0000 (19:18 +0000)
committerWei Liu <[email protected]>
Mon, 17 Apr 2023 19:18:13 +0000 (19:18 +0000)
Merge the following 6 patches from tip/x86/sev, which are taken from
Michael Kelley's series [0]. The rest of Michael's series depend on
them.

  x86/hyperv: Change vTOM handling to use standard coco mechanisms
  init: Call mem_encrypt_init() after Hyper-V hypercall init is done
  x86/mm: Handle decryption/re-encryption of bss_decrypted consistently
  Drivers: hv: Explicitly request decrypted in vmap_pfn() calls
  x86/hyperv: Reorder code to facilitate future work
  x86/ioremap: Add hypervisor callback for private MMIO mapping in coco VM

0: https://lore.kernel.org/linux-hyperv/1679838727[email protected]/

1  2 
arch/x86/kernel/cpu/mshyperv.c
arch/x86/kernel/x86_init.c
drivers/hv/vmbus_drv.c
init/main.c

Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
This page took 0.103758 seconds and 4 git commands to generate.