| commit | fe30021c36fbfb71d6ff25a424342149e58bba52 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Nov 16 16:10:59 2019 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Nov 16 16:10:59 2019 -0800 |
| tree | 111be9ec73704fc5df7919781874b3981290ffaf | |
| parent | 3278b3b6782c562079a3e0af0979968fd94d141c [diff] | |
| parent | c8eafe1495303bfd0eedaa8156b1ee9082ee9642 [diff] |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/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