From: Ingo Molnar <mingo@kernel.org>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Andy Lutomirski <luto@kernel.org>
Cc: linux-efi@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
Sai Praneeth <sai.praneeth.prakhya@intel.com>,
linux-kernel@vger.kernel.org, "Lee, Chun-Yi" <jlee@suse.com>,
Borislav Petkov <bp@alien8.de>, Tony Luck <tony.luck@intel.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
Bhupesh Sharma <bhsharma@redhat.com>,
Ricardo Neri <ricardo.neri@intel.com>,
Ravi Shankar <ravi.v.shankar@intel.com>
Subject: Re: [PATCH 2/5] x86/efi: Replace efi_pgd with efi_mm.pgd
Date: Mon, 12 Mar 2018 10:26:51 +0100 [thread overview]
Message-ID: <20180312092650.nbvidgia5s5r5t7b@gmail.com> (raw)
In-Reply-To: <20180312090220.lmohpvj62v7l2qsc@gmail.com>
* Ingo Molnar <mingo@kernel.org> wrote:
> > -static pgd_t *efi_pgd;
> > -
>
> Hm, so there's some interaction here with:
>
> 116fef640859: x86/mm/dump_pagetables: Add the EFI pagetable to the debugfs 'page_tables' directory
>
> which is in tip:x86/mm.
>
> Could you please resolve that conflict? I'll sort out the topic branches
> afterwards.
So I've resolved it the following way, I merged the conflicting commit into
tip:efi/core and applied the 3 unrelated patches from your series:
36b649760e94: efi: Use string literals for efi_char16_t variable initializers
136d5d57e35c: efi/esrt: Fix handling of early ESRT table mapping
7e904a91bf60: efi: Use efi_mm in x86 as well as ARM
b0599e2801df: Merge branch 'x86/mm' into efi/core
and pushed it out.
So if you could resolve the two conflicting patches on top of 36b649760e94 then we
should be good going forward.
Thanks,
Ingo
next prev parent reply other threads:[~2018-03-12 9:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-12 8:44 [GIT PULL 0/5] more EFI changes for v4.17 Ard Biesheuvel
2018-03-12 8:44 ` [PATCH 1/5] efi: Use efi_mm in x86 as well as ARM Ard Biesheuvel
2018-03-12 9:31 ` [tip:efi/core] " tip-bot for Sai Praneeth
2018-03-12 8:44 ` [PATCH 2/5] x86/efi: Replace efi_pgd with efi_mm.pgd Ard Biesheuvel
2018-03-12 9:02 ` Ingo Molnar
2018-03-12 9:26 ` Ingo Molnar [this message]
2018-03-12 9:28 ` Ard Biesheuvel
2018-03-12 9:48 ` Ingo Molnar
2018-03-12 8:44 ` [PATCH 3/5] x86/efi: Use efi_switch_mm() rather than manually twiddling with %cr3 Ard Biesheuvel
2018-03-12 8:44 ` [PATCH 4/5] efi/esrt: fix handling of early ESRT table mapping Ard Biesheuvel
2018-03-12 9:31 ` [tip:efi/core] efi/esrt: Fix " tip-bot for Ard Biesheuvel
2018-03-12 8:45 ` [PATCH 5/5] efi: use string literals for efi_char16_t variable initializers Ard Biesheuvel
2018-03-12 9:31 ` [tip:efi/core] efi: Use " tip-bot for Ard Biesheuvel
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=20180312092650.nbvidgia5s5r5t7b@gmail.com \
--to=mingo@kernel.org \
--cc=ard.biesheuvel@linaro.org \
--cc=bhsharma@redhat.com \
--cc=bp@alien8.de \
--cc=jlee@suse.com \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mst@redhat.com \
--cc=ravi.v.shankar@intel.com \
--cc=ricardo.neri@intel.com \
--cc=sai.praneeth.prakhya@intel.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
Powered by JetHome