| Message ID | 20200517125754.8934-1-ardb@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Hi, On Sun, May 17, 2020 at 02:57:47PM +0200, Ard Biesheuvel wrote: > The following changes since commit a088b858f16af85e3db359b6c6aaa92dd3bc0921: > > efi/x86: Revert struct layout change to fix kexec boot regression (2020-04-14 08:32:17 +0200) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-urgent can you please make your tags unique? For example call this one: efi-urgent-for-v5.7-rc6 or so so that the git history can show for which -rc that urgent tag was meant? I mean, technically one can do that already with git but it would be easier if it had the rc in the name. We do that already in tip - either -rc name or the date of the tag. Also, using the same tag gives: From git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi ! [rejected] efi-next -> efi-next (would clobber existing tag) ! [rejected] efi-urgent -> efi-urgent (would clobber existing tag) when I try to fetch from you and I can delete the old tag but having unique tag names makes the history more user-friendly, I'd say. Thx.
On Mon, 18 May 2020 at 11:07, Borislav Petkov <bp@alien8.de> wrote: > > Hi, > > On Sun, May 17, 2020 at 02:57:47PM +0200, Ard Biesheuvel wrote: > > The following changes since commit a088b858f16af85e3db359b6c6aaa92dd3bc0921: > > > > efi/x86: Revert struct layout change to fix kexec boot regression (2020-04-14 08:32:17 +0200) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-urgent > > can you please make your tags unique? For example call this one: > > efi-urgent-for-v5.7-rc6 > > or so so that the git history can show for which -rc that urgent tag was > meant? > > I mean, technically one can do that already with git but it would be > easier if it had the rc in the name. We do that already in tip - either > -rc name or the date of the tag. > > Also, using the same tag gives: > > From git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi > ! [rejected] efi-next -> efi-next (would clobber existing tag) > ! [rejected] efi-urgent -> efi-urgent (would clobber existing tag) > > when I try to fetch from you and I can delete the old tag but having > unique tag names makes the history more user-friendly, I'd say. > Sure
On Sun, 17 May 2020 at 14:58, Ard Biesheuvel <ardb@kernel.org> wrote: > > The following changes since commit a088b858f16af85e3db359b6c6aaa92dd3bc0921: > > efi/x86: Revert struct layout change to fix kexec boot regression (2020-04-14 08:32:17 +0200) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-urgent > > for you to fetch changes up to b4f1874c62168159fdb419ced4afc77c1b51c475: > > tpm: check event log version before reading final events (2020-05-17 11:46:50 +0200) > > ---------------------------------------------------------------- > EFI fixes for v5.7-rcX: > - fix EFI framebuffer earlycon for wide fonts > - avoid filling screen_info with garbage if the EFI framebuffer is not > available > - fix a potential host tool build error due to a symbol clash on x86 > - work around a EFI firmware bug regarding the binary format of the TPM > final events table > - fix a missing memory free by reworking the E820 table sizing routine to > not do the allocation in the first place > - add CPER parsing for firmware errors > > ---------------------------------------------------------------- > Arvind Sankar (1): > x86/boot: Mark global variables as static > > Benjamin Thiel (1): > efi: Pull up arch-specific prototype efi_systab_show_arch() > > Dave Young (1): > efi/earlycon: Fix early printk for wider fonts > > Heinrich Schuchardt (1): > efi/libstub: Avoid returning uninitialized data from setup_graphics() > > Lenny Szubowicz (1): > efi/libstub/x86: Avoid EFI map buffer alloc in allocate_e820() > > Loïc Yhuel (1): > tpm: check event log version before reading final events > > Punit Agrawal (1): > efi: cper: Add support for printing Firmware Error Record Reference > > arch/x86/boot/tools/build.c | 16 ++++----- > drivers/firmware/efi/cper.c | 62 +++++++++++++++++++++++++++++++++ > drivers/firmware/efi/earlycon.c | 14 ++++---- > drivers/firmware/efi/efi.c | 5 +-- > drivers/firmware/efi/libstub/arm-stub.c | 6 +++- > drivers/firmware/efi/libstub/efistub.h | 13 +++++++ > drivers/firmware/efi/libstub/mem.c | 2 -- > drivers/firmware/efi/libstub/tpm.c | 5 +-- > drivers/firmware/efi/libstub/x86-stub.c | 24 +++++-------- > drivers/firmware/efi/tpm.c | 5 ++- > include/linux/cper.h | 9 +++++ > include/linux/efi.h | 2 ++ > 12 files changed, 124 insertions(+), 39 deletions(-) Ping?
On Fri, May 22, 2020 at 03:06:20PM +0200, Ard Biesheuvel wrote:
> Ping?
Did you want to make your tags unique from the next pull request onwards
and I were supposed to pull this one as is?
Thx.
On Fri, 22 May 2020 at 15:40, Borislav Petkov <bp@alien8.de> wrote: > > On Fri, May 22, 2020 at 03:06:20PM +0200, Ard Biesheuvel wrote: > > Ping? > > Did you want to make your tags unique from the next pull request onwards > and I were supposed to pull this one as is? > What usually happens is that Ingo applies the patches piecemeal, ignoring the tag altogether, so without any coordination between you as x86 maintainers or communication back to me, that is what i was expecting to happen this time as well. Note that I have another PR pending since two weeks ago [0]. So if you want to start dealing with the EFI trees in a different way from now on, that is perfectly fine with me, but please align with Ingo and Thomas first. Thanks, Ard. [0] https://lore.kernel.org/linux-efi/20200508180157.1816-1-ardb@kernel.org/
Ard, Ard Biesheuvel <ardb@kernel.org> writes: > On Fri, 22 May 2020 at 15:40, Borislav Petkov <bp@alien8.de> wrote: >> >> On Fri, May 22, 2020 at 03:06:20PM +0200, Ard Biesheuvel wrote: >> > Ping? >> >> Did you want to make your tags unique from the next pull request onwards >> and I were supposed to pull this one as is? > > What usually happens is that Ingo applies the patches piecemeal, > ignoring the tag altogether, so without any coordination between you > as x86 maintainers or communication back to me, that is what i was > expecting to happen this time as well. > > Note that I have another PR pending since two weeks ago [0]. > > So if you want to start dealing with the EFI trees in a different way > from now on, that is perfectly fine with me, but please align with > Ingo and Thomas first. /me dons managerial hat Yes, please. Your pull request really do not need any special handling. Please add a unique signed tag to each pull request and stick the description, e.g. " EFI fixes for v5.7-rcX: - fix EFI framebuffer earlycon for wide fonts - avoid filling screen_info with garbage...." into the tag which gives us the merge commit message automagically. Thanks tglx
On Fri, 22 May 2020 at 16:04, Thomas Gleixner <tglx@linutronix.de> wrote: > > Ard, > > Ard Biesheuvel <ardb@kernel.org> writes: > > On Fri, 22 May 2020 at 15:40, Borislav Petkov <bp@alien8.de> wrote: > >> > >> On Fri, May 22, 2020 at 03:06:20PM +0200, Ard Biesheuvel wrote: > >> > Ping? > >> > >> Did you want to make your tags unique from the next pull request onwards > >> and I were supposed to pull this one as is? > > > > What usually happens is that Ingo applies the patches piecemeal, > > ignoring the tag altogether, so without any coordination between you > > as x86 maintainers or communication back to me, that is what i was > > expecting to happen this time as well. > > > > Note that I have another PR pending since two weeks ago [0]. > > > > So if you want to start dealing with the EFI trees in a different way > > from now on, that is perfectly fine with me, but please align with > > Ingo and Thomas first. > > /me dons managerial hat > > Yes, please. Your pull request really do not need any special handling. > > Please add a unique signed tag to each pull request and stick the > description, e.g. > > " EFI fixes for v5.7-rcX: > - fix EFI framebuffer earlycon for wide fonts > - avoid filling screen_info with garbage...." > > into the tag which gives us the merge commit message automagically. > Sure. In that case, please pull these changes from efi-fixes-for-v5.7-rc6 instead, and disregard the PR for v5.8. I will respin that, include some patches that came in in the mean time, and tag it in the correct way before resending the PR.
The following changes since commit a088b858f16af85e3db359b6c6aaa92dd3bc0921: efi/x86: Revert struct layout change to fix kexec boot regression (2020-04-14 08:32:17 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-urgent for you to fetch changes up to b4f1874c62168159fdb419ced4afc77c1b51c475: tpm: check event log version before reading final events (2020-05-17 11:46:50 +0200) ---------------------------------------------------------------- EFI fixes for v5.7-rcX: - fix EFI framebuffer earlycon for wide fonts - avoid filling screen_info with garbage if the EFI framebuffer is not available - fix a potential host tool build error due to a symbol clash on x86 - work around a EFI firmware bug regarding the binary format of the TPM final events table - fix a missing memory free by reworking the E820 table sizing routine to not do the allocation in the first place - add CPER parsing for firmware errors ---------------------------------------------------------------- Arvind Sankar (1): x86/boot: Mark global variables as static Benjamin Thiel (1): efi: Pull up arch-specific prototype efi_systab_show_arch() Dave Young (1): efi/earlycon: Fix early printk for wider fonts Heinrich Schuchardt (1): efi/libstub: Avoid returning uninitialized data from setup_graphics() Lenny Szubowicz (1): efi/libstub/x86: Avoid EFI map buffer alloc in allocate_e820() Loïc Yhuel (1): tpm: check event log version before reading final events Punit Agrawal (1): efi: cper: Add support for printing Firmware Error Record Reference arch/x86/boot/tools/build.c | 16 ++++----- drivers/firmware/efi/cper.c | 62 +++++++++++++++++++++++++++++++++ drivers/firmware/efi/earlycon.c | 14 ++++---- drivers/firmware/efi/efi.c | 5 +-- drivers/firmware/efi/libstub/arm-stub.c | 6 +++- drivers/firmware/efi/libstub/efistub.h | 13 +++++++ drivers/firmware/efi/libstub/mem.c | 2 -- drivers/firmware/efi/libstub/tpm.c | 5 +-- drivers/firmware/efi/libstub/x86-stub.c | 24 +++++-------- drivers/firmware/efi/tpm.c | 5 ++- include/linux/cper.h | 9 +++++ include/linux/efi.h | 2 ++ 12 files changed, 124 insertions(+), 39 deletions(-)