Merge branch 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jan 2020 21:06:05 +0000 (13:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jan 2020 21:06:05 +0000 (13:06 -0800)
commit511fdb78442229ac11057b4a55c3f03c253c062f
tree539942cbb071ee8d4ce49f79d903e0ee1a7230cd
parent4d6245ce8c8b441e01a3a1c1e67a1963a84498dd
parent4fc265a9c9b258ddd7eafbd0dbfca66687c3d8aa
Merge branch 'x86-mtrr-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 mtrr updates from Ingo Molnar:
 "Two changes: restrict /proc/mtrr to CAP_SYS_ADMIN, plus a cleanup"

* 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mtrr: Require CAP_SYS_ADMIN for all access
  x86/mtrr: Get rid of mtrr_seq_show() forward declaration