diff options
| author | Linus Torvalds <[email protected]> | 2019-11-17 00:10:59 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2019-11-17 00:10:59 +0000 |
| commit | fe30021c36fbfb71d6ff25a424342149e58bba52 (patch) | |
| tree | 111be9ec73704fc5df7919781874b3981290ffaf /net/tipc/core.c | |
| parent | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | x86/resctrl: Fix potential lockdep warning (diff) | |
| download | kernel-fe30021c36fbfb71d6ff25a424342149e58bba52.tar.gz kernel-fe30021c36fbfb71d6ff25a424342149e58bba52.zip | |
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
Diffstat (limited to 'net/tipc/core.c')
0 files changed, 0 insertions, 0 deletions