From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Jul 2019 00:25:53 +0000 (-0700)
Subject: Merge branch 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.3-rc1~198
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6cfcdad7630de2b2eb09740bdc6ee921de8c785e;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/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
---

6cfcdad7630de2b2eb09740bdc6ee921de8c785e