From: Linus Torvalds Date: Tue, 16 Jul 2024 01:22:48 +0000 (-0700) Subject: Merge tag 'ras_core_for_v6.11_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v6.11-rc1~203 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1467b49869df43c4ee51bdaa0ec1cb69e333407d;p=thirdparty%2Flinux.git Merge tag 'ras_core_for_v6.11_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull RAS updates from Borislav Petkov: - A cleanup and a correction to the error injection driver to inject a MCA_MISC value only when one has actually been supplied by the user * tag 'ras_core_for_v6.11_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/mce: Remove unused variable and return value in machine_check_poll() x86/mce/inject: Only write MCA_MISC when a value has been supplied --- 1467b49869df43c4ee51bdaa0ec1cb69e333407d