# git rev-parse -q --verify 143a6252e1b8ab424b4b293512a97cca7295c182^{commit} 143a6252e1b8ab424b4b293512a97cca7295c182 already have revision, skipping fetch # git checkout -q -f -B kisskb 143a6252e1b8ab424b4b293512a97cca7295c182 # git clean -qxdf # < git log -1 # commit 143a6252e1b8ab424b4b293512a97cca7295c182 # Merge: d6edf9510966 0616ea3f1b93 # Author: Linus Torvalds # Date: Mon May 23 21:06:11 2022 -0700 # # Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux # # Pull arm64 updates from Catalin Marinas: # # - Initial support for the ARMv9 Scalable Matrix Extension (SME). # # SME takes the approach used for vectors in SVE and extends this to # provide architectural support for matrix operations. No KVM support # yet, SME is disabled in guests. # # - Support for crashkernel reservations above ZONE_DMA via the # 'crashkernel=X,high' command line option. # # - btrfs search_ioctl() fix for live-lock with sub-page faults. # # - arm64 perf updates: support for the Hisilicon "CPA" PMU for # monitoring coherent I/O traffic, support for Arm's CMN-650 and # CMN-700 interconnect PMUs, minor driver fixes, kerneldoc cleanup. # # - Kselftest updates for SME, BTI, MTE. # # - Automatic generation of the system register macros from a 'sysreg' # file describing the register bitfields. # # - Update the type of the function argument holding the ESR_ELx register # value to unsigned long to match the architecture register size # (originally 32-bit but extended since ARMv8.0). # # - stacktrace cleanups. # # - ftrace cleanups. # # - Miscellaneous updates, most notably: arm64-specific huge_ptep_get(), # avoid executable mappings in kexec/hibernate code, drop TLB flushing # from get_clear_flush() (and rename it to get_clear_contig()), # ARCH_NR_GPIO bumped to 2048 for ARCH_APPLE. # # * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (145 commits) # arm64/sysreg: Generate definitions for FAR_ELx # arm64/sysreg: Generate definitions for DACR32_EL2 # arm64/sysreg: Generate definitions for CSSELR_EL1 # arm64/sysreg: Generate definitions for CPACR_ELx # arm64/sysreg: Generate definitions for CONTEXTIDR_ELx # arm64/sysreg: Generate definitions for CLIDR_EL1 # arm64/sve: Move sve_free() into SVE code section # arm64: Kconfig.platforms: Add comments # arm64: Kconfig: Fix indentation and add comments # arm64: mm: avoid writable executable mappings in kexec/hibernate code # arm64: lds: move special code sections out of kernel exec segment # arm64/hugetlb: Implement arm64 specific huge_ptep_get() # arm64/hugetlb: Use ptep_get() to get the pte value of a huge page # arm64: kdump: Do not allocate crash low memory if not needed # arm64/sve: Generate ZCR definitions # arm64/sme: Generate defintions for SVCR # arm64/sme: Generate SMPRI_EL1 definitions # arm64/sme: Automatically generate SMPRIMAP_EL2 definitions # arm64/sme: Automatically generate SMIDR_EL1 defines # arm64/sme: Automatically generate defines for SMCR # ... # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 143a6252e1b8ab424b4b293512a97cca7295c182 # < make -s -j 40 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/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 # < make -s -j 40 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 40 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12478:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12481:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:12483:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12485:warning: override: reassigning to symbol UML_NET_SLIP .config:12488:warning: override: reassigning to symbol UML_NET_MCAST .config:12490:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 40 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 In file included from /kisskb/src/arch/x86/um/asm/processor.h:41:0, from /kisskb/src/include/linux/mutex.h:19, from /kisskb/src/include/linux/kernfs.h:11, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:35, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:26: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function 'kfd_cpumask_to_apic_id': /kisskb/src/arch/um/include/asm/processor-generic.h:103:18: error: called object is not a function or function pointer #define cpu_data (&boot_cpu_data) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1557:9: note: in expansion of macro 'cpu_data' return cpu_data(first_cpu_of_numa_node).apicid; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1561:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c: In function 'rvt_wss_llc_size': /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c:88:22: error: 'struct cpuinfo_um' has no member named 'x86_cache_size' return boot_cpu_data.x86_cache_size; ^ /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c: In function 'cacheless_memcpy': /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c:100:2: error: implicit declaration of function '__copy_user_nocache' [-Werror=implicit-function-declaration] __copy_user_nocache(dst, (void __user *)src, n, 0); ^ /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c: In function 'rvt_wss_llc_size': /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c:89:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/infiniband/sw/rdmavt/qp.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/infiniband/sw/rdmavt] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/infiniband/sw] Error 2 make[3]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c: In function 'qib_unordered_wc': /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:22: error: 'struct cpuinfo_um' has no member named 'x86_vendor' return boot_cpu_data.x86_vendor != X86_VENDOR_AMD; ^ /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:37: error: 'X86_VENDOR_AMD' undeclared (first use in this function) return boot_cpu_data.x86_vendor != X86_VENDOR_AMD; ^ /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:37: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:150:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/infiniband/hw/qib/qib_wc_x86_64.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/infiniband/hw/qib] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/infiniband/hw] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/infiniband] Error 2 make[2]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1834: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 40 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allyesconfig_um-x86_64 # Build took: 0:06:01.343763