From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 17 Nov 2019 00:10:59 +0000 (-0800)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.4-rc8~5
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fe30021c36fbfb71d6ff25a424342149e58bba52;p=linux-2.6-block.git

Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
 "Two fixes: disable unreliable HPET on Intel Coffe Lake platforms, and
  fix a lockdep splat in the resctrl code"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/resctrl: Fix potential lockdep warning
  x86/quirks: Disable HPET on Intel Coffe Lake platforms
---

fe30021c36fbfb71d6ff25a424342149e58bba52