From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Oct 2020 17:42:23 +0000 (-0700)
Subject: Merge tag 'x86_misc_for_v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
X-Git-Tag: v5.15~2762
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9e536c817960c698c23feed6f9bff6d192805543;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'x86_misc_for_v5.10' of git://git./linux/kernel/git/tip/tip

Pull misc x86 fixes fromm Borislav Petkov:

 - Ratelimit the message about writes to unrecognized MSRs so that they
   don't spam the console log (Chris Down)

 - Document how the /proc/cpuinfo machinery works for future reference
   (Kyung Min Park, Ricardo Neri and Dave Hansen)

 - Correct the current NMI's duration calculation (Libing Zhou)

* tag 'x86_misc_for_v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/nmi: Fix nmi_handle() duration miscalculation
  Documentation/x86: Add documentation for /proc/cpuinfo feature flags
  x86/msr: Make source of unrecognised MSR writes unambiguous
  x86/msr: Prevent userspace MSR access from dominating the console
---

9e536c817960c698c23feed6f9bff6d192805543