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 (AMD)" <bp@alien8•de>,
Ilias Apalodimas <ilias.apalodimas@linaro•org>,
"Kirill A. Shutemov" <kirill.shutemov@linux•intel.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Masahisa Kojima <masahisa.kojima@linaro•org>
Subject: linux-next: manual merge of the efi tree with the tip tree
Date: Wed, 7 Jun 2023 12:08:15 +1000 [thread overview]
Message-ID: <20230607120815.7b569f57@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1191 bytes --]
Hi all,
Today's linux-next merge of the efi tree got a conflict in:
drivers/firmware/efi/Makefile
between commit:
2053bc57f367 ("efi: Add unaccepted memory support")
from the tip tree and commit:
39c90699b330 ("efi: Add tee-based EFI variable driver")
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/firmware/efi/Makefile
index e489fefd23da,2ca8ee6ab490..000000000000
--- a/drivers/firmware/efi/Makefile
+++ b/drivers/firmware/efi/Makefile
@@@ -41,4 -41,4 +41,5 @@@ obj-$(CONFIG_EFI_CAPSULE_LOADER) += cap
obj-$(CONFIG_EFI_EARLYCON) += earlycon.o
obj-$(CONFIG_UEFI_CPER_ARM) += cper-arm.o
obj-$(CONFIG_UEFI_CPER_X86) += cper-x86.o
+obj-$(CONFIG_UNACCEPTED_MEMORY) += unaccepted_memory.o
+ obj-$(CONFIG_TEE_STMM_EFI) += stmm/tee_stmm_efi.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-06-07 2:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 2:08 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-11-25 1:22 linux-next: manual merge of the efi tree with the tip tree Stephen Rothwell
2022-11-25 10:29 ` Borislav Petkov
2022-04-26 6:16 Stephen Rothwell
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=20230607120815.7b569f57@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ardb@kernel$(echo .)org \
--cc=bp@alien8$(echo .)de \
--cc=hpa@zytor$(echo .)com \
--cc=ilias.apalodimas@linaro$(echo .)org \
--cc=kirill.shutemov@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=masahisa.kojima@linaro$(echo .)org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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