linux-kernel - Re: [PATCH 2/5] x86/efi: Replace efi_pgd with efi

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 12 Mar 2018 09:28:06 +0000
From:   Ard Biesheuvel <ard.biesheuvel@...aro.org>
To:     Ingo Molnar <mingo@...nel.org>
Cc:     Andy Lutomirski <luto@...nel.org>, linux-efi@...r.kernel.org,
        Thomas Gleixner <tglx@...utronix.de>,
        Sai Praneeth <sai.praneeth.prakhya@...el.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        "Lee, Chun-Yi" <jlee@...e.com>, Borislav Petkov <bp@...en8.de>,
        Tony Luck <tony.luck@...el.com>,
        "Michael S . Tsirkin" <mst@...hat.com>,
        Bhupesh Sharma <bhsharma@...hat.com>,
        Ricardo Neri <ricardo.neri@...el.com>,
        Ravi Shankar <ravi.v.shankar@...el.com>
Subject: Re: [PATCH 2/5] x86/efi: Replace efi_pgd with efi_mm.pgd

On 12 March 2018 at 09:26, Ingo Molnar <mingo@...nel.org> wrote:
>
> * Ingo Molnar <mingo@...nel.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.
>

By 'resolve' you mean rebase and resend, right?