# git rev-parse -q --verify e6f39a90de9213693db19aeb2ddea54163f104d7^{commit} e6f39a90de9213693db19aeb2ddea54163f104d7 already have revision, skipping fetch # git checkout -q -f -B kisskb e6f39a90de9213693db19aeb2ddea54163f104d7 # git clean -qxdf # < git log -1 # commit e6f39a90de9213693db19aeb2ddea54163f104d7 # Merge: 5ddfc2460611 1ad55cecf22f # Author: Linus Torvalds # Date: Fri Feb 9 10:40:50 2024 -0800 # # Merge tag 'efi-fixes-for-v6.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi # # Pull EFI fixes from Ard Biesheuvel: # "The only notable change here is the patch that changes the way we deal # with spurious errors from the EFI memory attribute protocol. This will # be backported to v6.6, and is intended to ensure that we will not # paint ourselves into a corner when we tighten this further in order to # comply with MS requirements on signed EFI code. # # Note that this protocol does not currently exist in x86 production # systems in the field, only in Microsoft's fork of OVMF, but it will be # mandatory for Windows logo certification for x86 PCs in the future. # # - Tighten ELF relocation checks on the RISC-V EFI stub # # - Give up if the new EFI memory attributes protocol fails spuriously # on x86 # # - Take care not to place the kernel in the lowest 16 MB of DRAM on # x86 # # - Omit special purpose EFI memory from memblock # # - Some fixes for the CXL CPER reporting code # # - Make the PE/COFF layout of mixed-mode capable images comply with a # strict interpretation of the spec" # # * tag 'efi-fixes-for-v6.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi: # x86/efistub: Use 1:1 file:memory mapping for PE/COFF .compat section # cxl/trace: Remove unnecessary memcpy's # cxl/cper: Fix errant CPER prints for CXL events # efi: Don't add memblocks for soft-reserved memory # efi: runtime: Fix potential overflow of soft-reserved region size # efi/libstub: Add one kernel-doc comment # x86/efistub: Avoid placing the kernel below LOAD_PHYSICAL_ADDR # x86/efistub: Give up if memory attribute protocol returns an error # riscv/efistub: Tighten ELF relocation check # riscv/efistub: Ensure GP-relative addressing is not used # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 e6f39a90de9213693db19aeb2ddea54163f104d7 # make -s -j 40 ARCH=um O=/kisskb/build/linus_allyesconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 allyesconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # Added to kconfig CONFIG_SPI_STM32_QSPI=n # < make -s -j 40 ARCH=um O=/kisskb/build/linus_allyesconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 40 ARCH=um O=/kisskb/build/linus_allyesconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:14388:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:14392:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:14394:warning: override: reassigning to symbol UML_NET_SLIP .config:14399:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 40 ARCH=um O=/kisskb/build/linus_allyesconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/x86/um/user-offsets.c:17:6: warning: no previous prototype for ‘foo’ [-Wmissing-prototypes] 17 | void foo(void) | ^~~ In file included from /kisskb/src/arch/um/kernel/asm-offsets.c:1: /kisskb/src/arch/x86/um/shared/sysdep/kernel-offsets.h:9:6: error: no previous prototype for ‘foo’ [-Werror=missing-prototypes] 9 | void foo(void) | ^~~ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:116: arch/um/kernel/asm-offsets.s] Error 1 make[2]: *** [/kisskb/src/Makefile:1199: prepare0] Error 2 make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 40 ARCH=um O=/kisskb/build/linus_allyesconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allyesconfig_um-x86_64-gcc12 # Build took: 0:00:17.920468