From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Dec 2014 21:22:42 +0000 (-0800)
Subject: Merge branch 'x86-mpx-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.6-pxa1908~21996
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=a54455766b9e3d3c27a6cef758355d2591d81d68;p=linux.git

Merge branch 'x86-mpx-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 MPX fixes from Thomas Gleixner:
 "Three updates for the new MPX infrastructure:
   - Use the proper error check in the trap handler
   - Add a proper config option for it
   - Bring documentation up to date"

* 'x86-mpx-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, mpx: Give MPX a real config option prompt
  x86, mpx: Update documentation
  x86_64/traps: Fix always true condition
---

a54455766b9e3d3c27a6cef758355d2591d81d68