All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@kernel.org>
To: Ard Biesheuvel <ardb@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Borislav Petkov <bp@alien8.de>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [GIT PULL] EFI changes for v5.8
Date: Mon, 1 Jun 2020 17:57:36 +0200	[thread overview]
Message-ID: <20200601155736.GA1698764@gmail.com> (raw)
In-Reply-To: <CAMj1kXEH+M6j0W8GbwmJ6B2g1Kxoj01XW0P2a5_1OBVFoiF7ZA@mail.gmail.com>


* Ard Biesheuvel <ardb@kernel.org> wrote:

> On Mon, 1 Jun 2020 at 15:24, Ingo Molnar <mingo@kernel.org> wrote:
> >
> > Linus,
> >
> > Please pull the latest efi/core git tree from:
> >
> >    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git efi-core-2020-06-01
> >
> >    # HEAD: e9524fb97ab5b41b85e1d3408f8e513433798f3c efi/x86: Don't blow away existing initrd
> >
> > The EFI changes for this cycle are:
> >
> >  - preliminary changes for RISC-V
> >  - Add support for setting the resolution on the EFI framebuffer
> >  - Simplify kernel image loading for arm64
> >  - Move .bss into .data via the linker script instead of relying on symbol
> >    annotations.
> >  - Get rid of __pure getters to access global variables
> >  - Clean up the config table matching arrays
> >  - Rename pr_efi/pr_efi_err to efi_info/efi_err, and use them consistently
> >  - Simplify and unify initrd loading
> >  - Parse the builtin command line on x86 (if provided)
> >  - Implement printk() support, including support for wide character strings
> >  - Simplify GDT handling in early mixed mode thunking code
> >  - Some other minor fixes and cleanups
> >
> >  Thanks,
> >
> >         Ingo
> >
> 
> Please note that Stephen reported a conflict with the ARM32 tree, due
> to the replacement of all instances of pr_efi_err() with efi_err(),
> including a couple in some ARM code that is being modified.
> 
> https://lore.kernel.org/linux-next/20200529152907.2205a298@canb.auug.org.au/

Indeed!

Since these semantic conflicts and build failures would not trigger on 
Linus's test builds normally, it might make sense to double check that 
this comes up empty after both the EFI and the arm32 merge:

  thule:~/tip> git grep -w pr_efi_err
  thule:~/tip> 

Thanks,

	Ingo

  reply	other threads:[~2020-06-01 15:57 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-01 13:24 [GIT PULL] EFI changes for v5.8 Ingo Molnar
2020-06-01 14:42 ` Ard Biesheuvel
2020-06-01 15:57   ` Ingo Molnar [this message]
2020-06-01 20:38   ` Linus Torvalds
2020-06-01 23:02     ` Linus Torvalds
2020-06-02  6:34       ` Ard Biesheuvel
2020-06-01 21:55 ` pr-tracker-bot
  -- strict thread matches above, loose matches on Subject: below --
2020-05-25  8:07 Ard Biesheuvel
2020-05-25 13:14 ` Ingo Molnar

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=20200601155736.GA1698764@gmail.com \
    --to=mingo@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=akpm@linux-foundation.org \
    --cc=ardb@kernel.org \
    --cc=bp@alien8.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.