# git rev-parse -q --verify daadb3bd0e8d3e317e36bc2c1542e86c528665e5^{commit} daadb3bd0e8d3e317e36bc2c1542e86c528665e5 already have revision, skipping fetch # git checkout -q -f -B kisskb daadb3bd0e8d3e317e36bc2c1542e86c528665e5 # git clean -qxdf # < git log -1 # commit daadb3bd0e8d3e317e36bc2c1542e86c528665e5 # Merge: 6ae71436cda7 f16cc980d649 # Author: Linus Torvalds # Date: Tue Jan 11 17:24:45 2022 -0800 # # Merge tag 'locking_core_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull locking updates from Borislav Petkov: # "Lots of cleanups and preparation. Highlights: # # - futex: Cleanup and remove runtime futex_cmpxchg detection # # - rtmutex: Some fixes for the PREEMPT_RT locking infrastructure # # - kcsan: Share owner_on_cpu() between mutex,rtmutex and rwsem and # annotate the racy owner->on_cpu access *once*. # # - atomic64: Dead-Code-Elemination" # # [ Description above by Peter Zijlstra ] # # * tag 'locking_core_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # locking/atomic: atomic64: Remove unusable atomic ops # futex: Fix additional regressions # locking: Allow to include asm/spinlock_types.h from linux/spinlock_types_raw.h # x86/mm: Include spinlock_t definition in pgtable. # locking: Mark racy reads of owner->on_cpu # locking: Make owner_on_cpu() into # lockdep/selftests: Adapt ww-tests for PREEMPT_RT # lockdep/selftests: Skip the softirq related tests on PREEMPT_RT # lockdep/selftests: Unbalanced migrate_disable() & rcu_read_lock(). # lockdep/selftests: Avoid using local_lock_{acquire|release}(). # lockdep: Remove softirq accounting on PREEMPT_RT. # locking/rtmutex: Add rt_mutex_lock_nest_lock() and rt_mutex_lock_killable(). # locking/rtmutex: Squash self-deadlock check for ww_rt_mutex. # locking: Remove rt_rwlock_is_contended(). # sched: Trigger warning if ->migration_disabled counter underflows. # futex: Fix sparc32/m68k/nds32 build regression # futex: Remove futex_cmpxchg detection # futex: Ensure futex_atomic_cmpxchg_inatomic() is present # kernel/locking: Use a pointer in ww_mutex_trylock(). # < /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 daadb3bd0e8d3e317e36bc2c1542e86c528665e5 # < 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:12168:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12171:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:12173:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12175:warning: override: reassigning to symbol UML_NET_SLIP .config:12178:warning: override: reassigning to symbol UML_NET_MCAST .config:12180: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 /kisskb/src/drivers/gpu/drm/ttm/ttm_module.c: In function 'ttm_prot_from_caching': /kisskb/src/drivers/gpu/drm/ttm/ttm_module.c:71:24: error: 'struct cpuinfo_um' has no member named 'x86' else if (boot_cpu_data.x86 > 3) ^ make[5]: *** [/kisskb/src/scripts/Makefile.build:287: drivers/gpu/drm/ttm/ttm_module.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/gpu/drm/ttm] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/gpu/drm] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1851: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:219: __sub-make] Error 2 Command '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 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allyesconfig_um-x86_64 # Build took: 0:09:13.057406