# git rev-parse -q --verify 1930a6e739c4b4a654a69164dbe39e554d228915^{commit} 1930a6e739c4b4a654a69164dbe39e554d228915 already have revision, skipping fetch # git checkout -q -f -B kisskb 1930a6e739c4b4a654a69164dbe39e554d228915 # git clean -qxdf # < git log -1 # commit 1930a6e739c4b4a654a69164dbe39e554d228915 # Merge: 0a815d0135f1 dcbc65aac283 # Author: Linus Torvalds # Date: Mon Mar 28 17:29:53 2022 -0700 # # Merge tag 'ptrace-cleanups-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace # # Pull ptrace cleanups from Eric Biederman: # "This set of changes removes tracehook.h, moves modification of all of # the ptrace fields inside of siglock to remove races, adds a missing # permission check to ptrace.c # # The removal of tracehook.h is quite significant as it has been a major # source of confusion in recent years. Much of that confusion was around # task_work and TIF_NOTIFY_SIGNAL (which I have now decoupled making the # semantics clearer). # # For people who don't know tracehook.h is a vestiage of an attempt to # implement uprobes like functionality that was never fully merged, and # was later superseeded by uprobes when uprobes was merged. For many # years now we have been removing what tracehook functionaly a little # bit at a time. To the point where anything left in tracehook.h was # some weird strange thing that was difficult to understand" # # * tag 'ptrace-cleanups-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: # ptrace: Remove duplicated include in ptrace.c # ptrace: Check PTRACE_O_SUSPEND_SECCOMP permission on PTRACE_SEIZE # ptrace: Return the signal to continue with from ptrace_stop # ptrace: Move setting/clearing ptrace_message into ptrace_stop # tracehook: Remove tracehook.h # resume_user_mode: Move to resume_user_mode.h # resume_user_mode: Remove #ifdef TIF_NOTIFY_RESUME in set_notify_resume # signal: Move set_notify_signal and clear_notify_signal into sched/signal.h # task_work: Decouple TIF_NOTIFY_SIGNAL and task_work # task_work: Call tracehook_notify_signal from get_signal on all architectures # task_work: Introduce task_work_pending # task_work: Remove unnecessary include from posix_timers.h # ptrace: Remove tracehook_signal_handler # ptrace: Remove arch_syscall_{enter,exit}_tracehook # ptrace: Create ptrace_report_syscall_{entry,exit} in ptrace.h # ptrace/arm: Rename tracehook_report_syscall report_syscall # ptrace: Move ptrace_report_syscall into ptrace.h # < /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 1930a6e739c4b4a654a69164dbe39e554d228915 # < make -s -j 32 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 32 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 32 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:12455:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12458:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:12460:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12462:warning: override: reassigning to symbol UML_NET_SLIP .config:12465:warning: override: reassigning to symbol UML_NET_MCAST .config:12467:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 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:289: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:551: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** 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:289: drivers/infiniband/hw/qib/qib_wc_x86_64.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:551: drivers/infiniband/hw/qib] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:551: drivers/infiniband/hw] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:551: drivers/infiniband] Error 2 make[2]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:551: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:551: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1830: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 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:09:10.840492