On Fri, 10 Jan 2020 at 19:13, Ingo Molnar <mingo@xxxxxxxxxx> wrote: > > > * Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> wrote: > > > On Fri, 3 Jan 2020 at 12:40, Ard Biesheuvel <ardb@xxxxxxxxxx> wrote: > > > > > > Ingo, Thomas, > > > > > > This is the second batch of EFI updates for v5.6. Two things are still > > > under discussion, so I'll probably have a few more changes for this > > > cycle in a week or so. > > > > > > The following changes since commit 0679715e714345d273c0e1eb78078535ffc4b2a1: > > > > > > efi/libstub/x86: Avoid globals to store context during mixed mode calls (2019-12-25 10:49:26 +0100) > > > > > > are available in the Git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-next > > > > > > for you to fetch changes up to d95e4feae5368a91775c4597a8f298ba84f31535: > > > > > > efi/x86: avoid RWX mappings for all of DRAM (2020-01-03 11:46:15 +0100) > > > > > > > Ingo, Thomas, > > > > I'll be submitting another PR later today or tomorrow that goes on top > > of these changes. Please let me know if you would like a v2 of this PR > > with the new content included, or rather keep them separate. > > So there's one complication I noticed, there's conflicts with ongoing > x86/mm work. I've merged x86/mm into efi/core (and will send the branches > in that order in the merge window), and the final three patches conflict. > > Mind sending those three patches and your other patches on top of the > latest efi/core (4444f8541dad)? > No problem. I'll rebase and retest, and send out the result end of today or tomorrow. Thanks, Ard.