From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ard Biesheuvel <ardb@kernel•org>,
Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: Borislav Petkov <bp@suse•de>,
Brijesh Singh <brijesh.singh@amd•com>,
Dov Murik <dovmurik@linux•ibm.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Tom Lendacky <thomas.lendacky@amd•com>
Subject: linux-next: manual merge of the efi tree with the tip tree
Date: Tue, 26 Apr 2022 16:16:16 +1000 [thread overview]
Message-ID: <20220426161616.798cf1f2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1569 bytes --]
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/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-04-26 6:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-26 6:16 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-07 2:08 linux-next: manual merge of the efi tree with the tip tree Stephen Rothwell
2022-11-25 1:22 Stephen Rothwell
2022-11-25 10:29 ` Borislav Petkov
2022-04-14 2:54 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220426161616.798cf1f2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ardb@kernel$(echo .)org \
--cc=bp@suse$(echo .)de \
--cc=brijesh.singh@amd$(echo .)com \
--cc=dovmurik@linux$(echo .)ibm.com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=thomas.lendacky@amd$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox