From: Linus Torvalds Date: Mon, 1 Aug 2022 16:49:29 +0000 (-0700) Subject: Merge tag 'x86_cpu_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: for-5.20/block-2022-08-04~168 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=42efa5e3a8888c45c15fc5a567cd77049a2e30f1;p=linux-block.git Merge tag 'x86_cpu_for_v6.0_rc1' of git://git./linux/kernel/git/tip/tip Pull x86 cpu updates from Borislav Petkov: - Remove the vendor check when selecting MWAIT as the default idle state - Respect idle=nomwait when supplied on the kernel cmdline - Two small cleanups * tag 'x86_cpu_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/cpu: Use MSR_IA32_MISC_ENABLE constants x86: Fix comment for X86_FEATURE_ZEN x86: Remove vendor checks from prefer_mwait_c1_over_halt x86: Handle idle=nomwait cmdline properly for x86_idle --- 42efa5e3a8888c45c15fc5a567cd77049a2e30f1