# git rev-parse -q --verify 222a21d29521d144f3dd7a0bc4d4020e448f0126^{commit} 222a21d29521d144f3dd7a0bc4d4020e448f0126 already have revision, skipping fetch # git checkout -q -f -B kisskb 222a21d29521d144f3dd7a0bc4d4020e448f0126 # git clean -qxdf # < git log -1 # commit 222a21d29521d144f3dd7a0bc4d4020e448f0126 # Merge: 8faef7125d02 eb876fbc248e # Author: Linus Torvalds # Date: Mon Jul 8 18:28:44 2019 -0700 # # Merge branch 'x86-topology-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull x86 topology updates from Ingo Molnar: # "Implement multi-die topology support on Intel CPUs and expose the die # topology to user-space tooling, by Len Brown, Kan Liang and Zhang Rui. # # These changes should have no effect on the kernel's existing # understanding of topologies, i.e. there should be no behavioral impact # on cache, NUMA, scheduler, perf and other topologies and overall # system performance" # # * 'x86-topology-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # perf/x86/intel/rapl: Cosmetic rename internal variables in response to multi-die/pkg support # perf/x86/intel/uncore: Cosmetic renames in response to multi-die/pkg support # hwmon/coretemp: Cosmetic: Rename internal variables to zones from packages # thermal/x86_pkg_temp_thermal: Cosmetic: Rename internal variables to zones from packages # perf/x86/intel/cstate: Support multi-die/package # perf/x86/intel/rapl: Support multi-die/package # perf/x86/intel/uncore: Support multi-die/package # topology: Create core_cpus and die_cpus sysfs attributes # topology: Create package_cpus sysfs attribute # hwmon/coretemp: Support multi-die/package # powercap/intel_rapl: Update RAPL domain name and debug messages # thermal/x86_pkg_temp_thermal: Support multi-die/package # powercap/intel_rapl: Support multi-die/package # powercap/intel_rapl: Simplify rapl_find_package() # x86/topology: Define topology_logical_die_id() # x86/topology: Define topology_die_id() # cpu/topology: Export die_id # x86/topology: Create topology_max_die_per_package() # x86/topology: Add CPUID.1F multi-die/package support # < /opt/cross/kisskb/gcc-4.6.3-nolibc/s390x-linux/bin/s390x-linux-gcc --version # < /opt/cross/kisskb/gcc-4.6.3-nolibc/s390x-linux/bin/s390x-linux-ld --version # < git log --format=%s --max-count=1 222a21d29521d144f3dd7a0bc4d4020e448f0126 # < make -s -j 24 ARCH=s390 O=/kisskb/build/linus_s390-defconfig_s390x CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/s390x-linux/bin/s390x-linux- defconfig # make -s -j 24 ARCH=s390 O=/kisskb/build/linus_s390-defconfig_s390x CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/s390x-linux/bin/s390x-linux- cc1: error: unrecognized command line option '-mtune=zEC12' cc1: error: unrecognized command line option '-mtune=zEC12' make[2]: *** [/kisskb/src/scripts/Makefile.build:112: scripts/mod/devicetable-offsets.s] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:279: scripts/mod/empty.o] Error 1 make[1]: *** [/kisskb/src/Makefile:1117: prepare0] Error 2 make: *** [Makefile:179: sub-make] Error 2 Command 'make -s -j 24 ARCH=s390 O=/kisskb/build/linus_s390-defconfig_s390x CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/s390x-linux/bin/s390x-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_s390-defconfig_s390x # Build took: 0:00:03.864372