Merge branch 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jul 2019 00:25:53 +0000 (17:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jul 2019 00:25:53 +0000 (17:25 -0700)
commit6cfcdad7630de2b2eb09740bdc6ee921de8c785e
treefb6f16f55dec1e6164bff60c8d19e2d787819388
parentc83b5d321b58794b8469d57990dc3884cbcd289e
parent2ef085bd110c5723ca08a522608ac3468dc304bd
Merge branch 'x86-cache-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 cache resource control update from Ingo Molnar:
 "Two cleanup patches"

* 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/resctrl: Cleanup cbm_ensure_valid()
  x86/resctrl: Use _ASM_BX to avoid ifdeffery
arch/x86/kernel/cpu/resctrl/pseudo_lock.c