diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-20 00:22:42 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-20 00:22:42 +0300 |
| commit | a54455766b9e3d3c27a6cef758355d2591d81d68 (patch) | |
| tree | c7187cc528befc675d49950332a1d9fe0e3f638b /net/sctp | |
| parent | 1092b596a56b6ac5fa3154dc75bfcbb6f27ac757 (diff) | |
| parent | 72e9b5fe9bee0826e7ce7599adbdc64e544780ef (diff) | |
| download | linux-a54455766b9e3d3c27a6cef758355d2591d81d68.tar.xz | |
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
Diffstat (limited to 'net/sctp')
0 files changed, 0 insertions, 0 deletions