Subject: linux-next: manual merge of the efi tree with the tip tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 26 Apr 2022 16:16:16 +1000

Hi all,

Today's linux-next merge of the efi tree got conflicts in:

  drivers/virt/Kconfig
  drivers/virt/Makefile

between commits:

  fce96cf04430 ("virt: Add SEV-SNP guest driver")
  9617f2f48310 ("virt: sevguest: Rename the sevguest dir and files to sev-guest")

from the tip tree and commit:

  cbabf03c3ef3 ("virt: Add efi_secret module to expose confidential computing secrets")

from the efi 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 drivers/virt/Kconfig
index 0c1bba7c5c66,c877da072d4d..000000000000
--- a/drivers/virt/Kconfig
+++ b/drivers/virt/Kconfig
@@@ -48,6 -48,6 +48,8 @@@ source "drivers/virt/nitro_enclaves/Kco
  
  source "drivers/virt/acrn/Kconfig"
  
 +source "drivers/virt/coco/sev-guest/Kconfig"
 +
+ source "drivers/virt/coco/efi_secret/Kconfig"
+ 
  endif
diff --cc drivers/virt/Makefile
index b2e6e864ebbe,067b5427f40f..000000000000
--- a/drivers/virt/Makefile
+++ b/drivers/virt/Makefile
@@@ -9,4 -9,4 +9,5 @@@ obj-y				+= vboxguest
  
  obj-$(CONFIG_NITRO_ENCLAVES)	+= nitro_enclaves/
  obj-$(CONFIG_ACRN_HSM)		+= acrn/
 +obj-$(CONFIG_SEV_GUEST)		+= coco/sev-guest/
+ obj-$(CONFIG_EFI_SECRET)	+= coco/efi_secret/