# git rev-parse -q --verify 1140ab592e2ebf8153d2b322604031a8868ce7a5^{commit} 1140ab592e2ebf8153d2b322604031a8868ce7a5 already have revision, skipping fetch # git checkout -q -f -B kisskb 1140ab592e2ebf8153d2b322604031a8868ce7a5 # git clean -qxdf # < git log -1 # commit 1140ab592e2ebf8153d2b322604031a8868ce7a5 # Merge: 142b507f911c 71d7924b3e8a # Author: Linus Torvalds # Date: Mon May 10 15:23:58 2021 -0700 # # Merge tag 'perf-tools-fixes-for-v5.13-2021-05-10' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux # # Pull perf tools fixes from Arnaldo Carvalho de Melo: # # - Fix swapping of cpu_map and stat_config records. # # - Fix dynamic libbpf linking. # # - Disallow -c and -F option at the same time in 'perf record'. # # - Update headers with the kernel originals. # # - Silence warning for JSON ArchStd files. # # - Fix a build error on arm64 with clang. # # * tag 'perf-tools-fixes-for-v5.13-2021-05-10' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: # tools headers UAPI: Sync perf_event.h with the kernel sources # tools headers cpufeatures: Sync with the kernel sources # tools include UAPI powerpc: Sync errno.h with the kernel headers # tools arch: Update arch/x86/lib/mem{cpy,set}_64.S copies used in 'perf bench mem memcpy' # tools headers UAPI: Sync linux/prctl.h with the kernel sources # tools headers UAPI: Sync files changed by landlock, quotactl_path and mount_settattr new syscalls # perf tools: Fix a build error on arm64 with clang # tools headers kvm: Sync kvm headers with the kernel sources # tools headers UAPI: Sync linux/kvm.h with the kernel sources # perf tools: Fix dynamic libbpf link # perf session: Fix swapping of cpu_map and stat_config records # perf jevents: Silence warning for ArchStd files # perf record: Disallow -c and -F option at the same time # tools arch x86: Sync the msr-index.h copy with the kernel sources # tools headers UAPI: Sync drm/i915_drm.h with the kernel sources # tools headers UAPI: Update tools's copy of drm.h headers # < /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 1140ab592e2ebf8153d2b322604031a8868ce7a5 # < make -s -j 8 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 8 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 8 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:4574:warning: override: reassigning to symbol GCC_PLUGIN_CYC_COMPLEXITY .config:4576:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:4580:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:4582:warning: override: reassigning to symbol UML_NET_SLIP .config:4585:warning: override: reassigning to symbol UML_NET_MCAST .config:4587:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 8 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 LINK linux Completed OK # rm -rf /kisskb/build/linus_um-allyesconfig_um-x86_64 # Build took: 0:09:39.723337