On Tue, 29 Sep 2020 at 20:24, Ard Biesheuvel <ardb@xxxxxxxxxx> wrote: > > The following changes since commit 612b5d506d066cdf0a739963e7cd28642d500ec1: > > cper,edac,efi: Memory Error Record: bank group/address and chip id (2020-09-17 10:19:52 +0300) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-next-for-v5.10-2 > > for you to fetch changes up to 963fabf37f6a94214a823df0a785e653cb8ad6ea: > > efi: efivars: limit availability to X86 builds (2020-09-29 19:40:57 +0200) > > Cc: Ingo Molnar <mingo@xxxxxxxxxx> > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > Cc: Borislav Petkov <bp@xxxxxxxxx> > It appears there is an issue with this PR in tip efi/core: My previous pull request for v5.10 ended at 612b5d506d066c (mentioned above), and the 7 patches below were meant to go on top. However, that commit (and some of its parents) appear in tip efi/core under a different commit ID, and therefore, the merge of this PR resulted in a non-FF merge, and the following patches now appear in duplicate: 612b5d506d06 (tag: efi-next-for-v5.10) cper,edac,efi: Memory Error Record: bank group/address and chip id 9baf68cc4544 edac,ghes,cper: Add Row Extension to Memory Error Record 4a568ce29d3f efi/x86: Add a quirk to support command line arguments on Dell EFI firmware 744de4180a43 cper,edac,efi: Memory Error Record: bank group/address and chip id 3c029b01da60 edac,ghes,cper: Add Row Extension to Memory Error Record d2778b4891fb efi/x86: Add a quirk to support command line arguments on Dell EFI firmware The only difference between d2778b4891fb and 4a568ce29d3f is that I fixed up a typo in a person's name in the commit log, the patches are otherwise identical. I recreated the tag right after, and the correct commit ID is referenced in the PR I sent originally. However, I don't remember if I failed to push the changes to kernel.org right away, or whether this is a kernel.org mirroring issue, but the end result is that that the wrong version of the tag got merged into efi/core This is not the end of the world, as the patches are identical. However, if you prefer to fix it, please reset efi/core to tags/efi-next-for-v5.10-2 - it covers the whole batch of EFI changes for v5.10. > ---------------------------------------------------------------- > Second batch of EFI updates for v5.10: > - followup fix for the new MOKvar table code > - split efi-pstore from the deprecated efivars sysfs code, so we can > disable the latter on !x86 > > ---------------------------------------------------------------- > Ard Biesheuvel (7): > efi: mokvar-table: fix some issues in new code > efi: pstore: disentangle from deprecated efivars module > efi: pstore: move workqueue handling out of efivars > efi: efivars: un-export efivars_sysfs_init() > efi: gsmi: fix false dependency on CONFIG_EFI_VARS > efi: remove some false dependencies on CONFIG_EFI_VARS > efi: efivars: limit availability to X86 builds > > Documentation/arm/uefi.rst | 2 +- > drivers/firmware/efi/Kconfig | 18 +++----- > drivers/firmware/efi/efi-pstore.c | 83 ++++++++++++++++++++++++++++++++++--- > drivers/firmware/efi/efivars.c | 45 +------------------- > drivers/firmware/efi/mokvar-table.c | 25 +++++------ > drivers/firmware/efi/vars.c | 21 ---------- > drivers/firmware/google/Kconfig | 2 +- > drivers/firmware/google/gsmi.c | 8 ++-- > include/linux/efi.h | 11 ----- > 9 files changed, 102 insertions(+), 113 deletions(-)
