# git rev-parse -q --verify 0fe5f9ca223573167c4c4156903d751d2c8e160e^{commit} 0fe5f9ca223573167c4c4156903d751d2c8e160e already have revision, skipping fetch # git checkout -q -f -B kisskb 0fe5f9ca223573167c4c4156903d751d2c8e160e # git clean -qxdf # < git log -1 # commit 0fe5f9ca223573167c4c4156903d751d2c8e160e # Merge: 3e0dea57686d 8b9a18a9f249 # Author: Linus Torvalds # Date: Sun Apr 19 11:58:32 2020 -0700 # # Merge tag 'x86-urgent-2020-04-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull x86 and objtool fixes from Thomas Gleixner: # "A set of fixes for x86 and objtool: # # objtool: # # - Ignore the double UD2 which is emitted in BUG() when # CONFIG_UBSAN_TRAP is enabled. # # - Support clang non-section symbols in objtool ORC dump # # - Fix switch table detection in .text.unlikely # # - Make the BP scratch register warning more robust. # # x86: # # - Increase microcode maximum patch size for AMD to cope with new CPUs # which have a larger patch size. # # - Fix a crash in the resource control filesystem when the removal of # the default resource group is attempted. # # - Preserve Code and Data Prioritization enabled state accross CPU # hotplug. # # - Update split lock cpu matching to use the new X86_MATCH macros. # # - Change the split lock enumeration as Intel finaly decided that the # IA32_CORE_CAPABILITIES bits are not architectural contrary to what # the SDM claims. !@#%$^! # # - Add Tremont CPU models to the split lock detection cpu match. # # - Add a missing static attribute to make sparse happy" # # * tag 'x86-urgent-2020-04-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # x86/split_lock: Add Tremont family CPU models # x86/split_lock: Bits in IA32_CORE_CAPABILITIES are not architectural # x86/resctrl: Preserve CDP enable over CPU hotplug # x86/resctrl: Fix invalid attempt at removing the default resource group # x86/split_lock: Update to use X86_MATCH_INTEL_FAM6_MODEL() # x86/umip: Make umip_insns static # x86/microcode/AMD: Increase microcode PATCH_MAX_SIZE # objtool: Make BP scratch register warning more robust # objtool: Fix switch table detection in .text.unlikely # objtool: Support Clang non-section symbols in ORC generation # objtool: Support Clang non-section symbols in ORC dump # objtool: Fix CONFIG_UBSAN_TRAP unreachable warnings # < /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 0fe5f9ca223573167c4c4156903d751d2c8e160e # < make -s -j 48 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 # < make -s -j 48 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 48 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:4245:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:4247:warning: override: reassigning to symbol UML_NET_SLIP .config:4250:warning: override: reassigning to symbol UML_NET_MCAST .config:4252:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 48 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 /kisskb/src/arch/um/os-Linux/signal.c: In function 'sig_handler_common': /kisskb/src/arch/um/os-Linux/signal.c:51:1: warning: the frame size of 2976 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ /kisskb/src/arch/um/os-Linux/signal.c: In function 'timer_real_alarm_handler': /kisskb/src/arch/um/os-Linux/signal.c:95:1: warning: the frame size of 2960 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ /kisskb/src/drivers/vdpa/vdpa_sim/vdpa_sim.c: In function 'vdpasim_create': /kisskb/src/drivers/vdpa/vdpa_sim/vdpa_sim.c:324:2: error: implicit declaration of function 'set_dma_ops' [-Werror=implicit-function-declaration] set_dma_ops(dev, &vdpasim_dma_ops); ^ cc1: some warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:267: drivers/vdpa/vdpa_sim/vdpa_sim.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:488: drivers/vdpa/vdpa_sim] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:488: drivers/vdpa] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/kernel/futex.c: In function 'futex_atomic_op_inuser': /kisskb/src/kernel/futex.c:1686:17: warning: 'oldval' may be used uninitialized in this function [-Wmaybe-uninitialized] return oldval > cmparg; ^ /kisskb/src/lib/lz4/lz4hc_compress.c: In function 'LZ4HC_compress_generic': /kisskb/src/lib/lz4/lz4hc_compress.c:579:1: warning: the frame size of 2144 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ /kisskb/src/security/apparmor/policy_unpack.c: In function 'unpack_profile': /kisskb/src/security/apparmor/policy_unpack.c:526:9: warning: 'pos' may be used uninitialized in this function [-Wmaybe-uninitialized] str[pos] = ':'; ^ /kisskb/src/security/apparmor/policy_unpack.c:497:14: note: 'pos' was declared here int c, j, pos, size2 = unpack_strdup(e, &str, NULL); ^ make[1]: *** [/kisskb/src/Makefile:1722: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/crypto/xor.c:17:0: /kisskb/src/arch/um/include/asm/xor.h:3:35: fatal error: shared/timer-internal.h: No such file or directory compilation terminated. make[2]: *** [/kisskb/src/scripts/Makefile.build:266: crypto/xor.o] Error 1 make[1]: *** [/kisskb/src/Makefile:1722: crypto] Error 2 /kisskb/src/fs/namei.c: In function 'handle_dots': /kisskb/src/fs/namei.c:1805:10: warning: 'inode' may be used uninitialized in this function [-Wmaybe-uninitialized] error = step_into(nd, WALK_NOFOLLOW, ^ /kisskb/src/net/mptcp/protocol.c: In function 'mptcp_sendmsg_frag': /kisskb/src/net/mptcp/protocol.c:606:6: warning: 'dfrag_collapsed' may be used uninitialized in this function [-Wmaybe-uninitialized] if (!dfrag_collapsed) { ^ make: *** [Makefile:180: sub-make] Error 2 Command 'make -s -j 48 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:04:13.220152