# git rev-parse -q --verify d67978318827d06f1c0fa4c31343a279e9df6fde^{commit} d67978318827d06f1c0fa4c31343a279e9df6fde already have revision, skipping fetch # git checkout -q -f -B kisskb d67978318827d06f1c0fa4c31343a279e9df6fde # git clean -qxdf # < git log -1 # commit d67978318827d06f1c0fa4c31343a279e9df6fde # Merge: 2439a5eaa753 34b3fc558b53 # Author: Linus Torvalds # Date: Mon Jul 15 20:25:16 2024 -0700 # # Merge tag 'x86_cpu_for_v6.11_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull x86 cpu model updates from Borislav Petkov: # # - Flip the logic to add feature names to /proc/cpuinfo to having to # explicitly specify the flag if there's a valid reason to show it in # /proc/cpuinfo # # - Switch a bunch of Intel x86 model checking code to the new CPU model # defines # # - Fixes and cleanups # # * tag 'x86_cpu_for_v6.11_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # x86/cpu/intel: Drop stray FAM6 check with new Intel CPU model defines # x86/cpufeatures: Flip the /proc/cpuinfo appearance logic # x86/CPU/AMD: Always inline amd_clear_divider() # x86/mce/inject: Add missing MODULE_DESCRIPTION() line # perf/x86/rapl: Switch to new Intel CPU model defines # x86/boot: Switch to new Intel CPU model defines # x86/cpu: Switch to new Intel CPU model defines # perf/x86/intel: Switch to new Intel CPU model defines # x86/virt/tdx: Switch to new Intel CPU model defines # x86/PCI: Switch to new Intel CPU model defines # x86/cpu/intel: Switch to new Intel CPU model defines # x86/platform/intel-mid: Switch to new Intel CPU model defines # x86/pconfig: Remove unused MKTME pconfig code # x86/cpu: Remove useless work in detect_tme_early() # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 d67978318827d06f1c0fa4c31343a279e9df6fde # make -s -j 160 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- pseries_le_defconfig Using /kisskb/src/arch/powerpc/configs/ppc64_defconfig as base Merging /kisskb/src/arch/powerpc/configs/le.config Merging /kisskb/src/arch/powerpc/configs/guest.config Value of CONFIG_VIRTIO_BLK is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_BLK=m New value: CONFIG_VIRTIO_BLK=y Value of CONFIG_SCSI_VIRTIO is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_SCSI_VIRTIO=m New value: CONFIG_SCSI_VIRTIO=y Value of CONFIG_VIRTIO_NET is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_NET=m New value: CONFIG_VIRTIO_NET=y Value of CONFIG_VIRTIO_CONSOLE is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_CONSOLE=m New value: CONFIG_VIRTIO_CONSOLE=y Value of CONFIG_VIRTIO_PCI is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_PCI=m New value: CONFIG_VIRTIO_PCI=y Value of CONFIG_VIRTIO_BALLOON is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_BALLOON=m New value: CONFIG_VIRTIO_BALLOON=y Value of CONFIG_VHOST_NET is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VHOST_NET=m New value: CONFIG_VHOST_NET=y Value of CONFIG_IBMVETH is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_IBMVETH=m New value: CONFIG_IBMVETH=y Value of CONFIG_IBMVNIC is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_IBMVNIC=m New value: CONFIG_IBMVNIC=y Merging /kisskb/src/arch/powerpc/configs/kvm_guest.config # # merged configuration written to .config (needs make) # # < make -s -j 160 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 160 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 160 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/linus_pseries_le_defconfig_powerpc-gcc5 # Build took: 0:02:30.848532