# git rev-parse -q --verify 16477cdfefdb494235a675cc80563d736991d833^{commit} 16477cdfefdb494235a675cc80563d736991d833 already have revision, skipping fetch # git checkout -q -f -B kisskb 16477cdfefdb494235a675cc80563d736991d833 # git clean -qxdf # < git log -1 # commit 16477cdfefdb494235a675cc80563d736991d833 # Merge: ecf0aa5317b0 b2441b3bdce6 # Author: Linus Torvalds # Date: Thu May 26 10:50:30 2022 -0700 # # Merge tag 'asm-generic-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic # # Pull asm-generic updates from Arnd Bergmann: # "The asm-generic tree contains three separate changes for linux-5.19: # # - The h8300 architecture is retired after it has been effectively # unmaintained for a number of years. This is the last architecture # we supported that has no MMU implementation, but there are still a # few architectures (arm, m68k, riscv, sh and xtensa) that support # CPUs with and without an MMU. # # - A series to add a generic ticket spinlock that can be shared by # most architectures with a working cmpxchg or ll/sc type atomic, # including the conversion of riscv, csky and openrisc. This series # is also a prerequisite for the loongarch64 architecture port that # will come as a separate pull request. # # - A cleanup of some exported uapi header files to ensure they can be # included from user space without relying on other kernel headers" # # * tag 'asm-generic-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: # h8300: remove stale bindings and symlink # sparc: add asm/stat.h to UAPI compile-test coverage # powerpc: add asm/stat.h to UAPI compile-test coverage # mips: add asm/stat.h to UAPI compile-test coverage # riscv: add linux/bpf_perf_event.h to UAPI compile-test coverage # kbuild: prevent exported headers from including , # agpgart.h: do not include from exported header # csky: Move to generic ticket-spinlock # RISC-V: Move to queued RW locks # RISC-V: Move to generic spinlocks # openrisc: Move to ticket-spinlock # asm-generic: qrwlock: Document the spinlock fairness requirements # asm-generic: qspinlock: Indicate the use of mixed-size atomics # asm-generic: ticket-lock: New generic ticket-based spinlock # remove the h8300 architecture # < /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 16477cdfefdb494235a675cc80563d736991d833 # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # 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 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_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 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12309:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12314:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12316:warning: override: reassigning to symbol UML_NET_SLIP .config:12319:warning: override: reassigning to symbol UML_NET_MCAST .config:12321:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_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:1620: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:1624: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:292: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:555: drivers/gpu/drm/amd/amdgpu] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:555: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:555: drivers/gpu] Error 2 make[2]: *** 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:292: drivers/infiniband/hw/qib/qib_wc_x86_64.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:555: drivers/infiniband/hw/qib] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:555: drivers/infiniband/hw] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:555: drivers/infiniband] Error 2 make[1]: *** [/kisskb/src/Makefile:1835: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_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-allmodconfig_um-x86_64 # Build took: 0:15:49.856962