On Wed, Sep 16, 2020 at 08:10:30PM +0200, Borislav Petkov wrote:
> On Wed, Sep 16, 2020 at 04:09:36PM +0300, Ard Biesheuvel wrote:
> > git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git next
>
> Looks good and no conflicts, builds fine too.
Excellent.
Thanks!
> [boris@zn: ~/kernel/linux> git fetch efi
> remote: Enumerating objects: 85, done.
> remote: Counting objects: 100% (85/85), done.
> remote: Compressing objects: 100% (14/14), done.
> remote: Total 131 (delta 71), reused 85 (delta 71), pack-reused 46
> Receiving objects: 100% (131/131), 113.14 KiB | 1.69 MiB/s, done.
> Resolving deltas: 100% (89/89), completed with 33 local objects.
> From git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
> + 84780c5438ef...744de4180a43 next -> efi/next (forced update)
> fb1201aececc..46908326c6b8 urgent -> efi/urgent
> * [new tag] efi-next-for-v5.10 -> efi-next-for-v5.10
> * [new tag] efi-urgent-for-v5.9-rc5 -> efi-urgent-for-v5.9-rc5
> * [new tag] efi-riscv-shared-for-v5.10 -> efi-riscv-shared-for-v5.10
> [boris@zn: ~/kernel/linux> git checkout -b test-merge ras/edac-for-next
> Branch 'test-merge' set up to track remote branch 'edac-for-next' from 'ras'.
> Switched to a new branch 'test-merge'
> [boris@zn: ~/kernel/linux> git merge efi/next
> Auto-merging drivers/firmware/efi/libstub/efi-stub-helper.c
> Auto-merging drivers/firmware/efi/efi.c
> Auto-merging drivers/edac/ghes_edac.c
> Auto-merging arch/x86/platform/efi/efi.c
> Merge made by the 'recursive' strategy.
> arch/arm/include/asm/efi.h | 23 +++--
> arch/arm64/include/asm/efi.h | 5 +-
> arch/x86/kernel/setup.c | 1 +
> arch/x86/platform/efi/efi.c | 3 +
> drivers/edac/ghes_edac.c | 17 +++-
> drivers/firmware/efi/Makefile | 3 +-
> drivers/firmware/efi/cper.c | 18 +++-
> drivers/firmware/efi/{arm-init.c => efi-init.c} | 1 +
> drivers/firmware/efi/efi.c | 6 ++
> drivers/firmware/efi/libstub/arm32-stub.c | 178 +++++++---------------------------
> drivers/firmware/efi/libstub/arm64-stub.c | 1 -
> drivers/firmware/efi/libstub/efi-stub-helper.c | 101 +++++++++++++++++++-
> drivers/firmware/efi/libstub/efi-stub.c | 48 +---------
> drivers/firmware/efi/libstub/efistub.h | 61 +++++++++++-
> drivers/firmware/efi/libstub/file.c | 5 +-
> drivers/firmware/efi/libstub/relocate.c | 4 +-
> drivers/firmware/efi/libstub/vsprintf.c | 2 +-
> drivers/firmware/efi/mokvar-table.c | 360 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> include/linux/cper.h | 24 ++++-
> include/linux/efi.h | 34 +++++++
> include/linux/pe.h | 3 +
> security/integrity/platform_certs/load_uefi.c | 85 +++++++++++++----
> 22 files changed, 746 insertions(+), 237 deletions(-)
> rename drivers/firmware/efi/{arm-init.c => efi-init.c} (99%)
> create mode 100644 drivers/firmware/efi/mokvar-table.c
>
> --
> Regards/Gruss,
> Boris.
>
> https://people.kernel.org/tglx/notes-about-netiquette
--
Russ Anderson, SuperDome Flex Linux Kernel Group Manager
HPE - Hewlett Packard Enterprise (formerly SGI) rja@xxxxxxx
