diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-21 15:46:17 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-21 15:46:17 -0800 | 
| commit | c6c9161d064d30e78904f3affe5184487493e0fc (patch) | |
| tree | 07387e6ee769c2cf24d13698cbe84f1af679a669 /tools/perf/scripts/python/net_dropmonitor.py | |
| parent | 8b2ed21e846c63d8f1bdee0d8df0645721a604a1 (diff) | |
| parent | b5e212a3051b65e426a513901d9c7001681c7215 (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
 "Misc fixes:
   - gold linker build fix
   - noxsave command line parsing fix
   - bugfix for NX setup
   - microcode resume path bug fix
   - _TIF_NOHZ versus TIF_NOHZ bugfix as discussed in the mysterious
     lockup thread"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, syscall: Fix _TIF_NOHZ handling in syscall_trace_enter_phase1
  x86, kaslr: Handle Gold linker for finding bss/brk
  x86, mm: Set NX across entire PMD at boot
  x86, microcode: Update BSPs microcode on resume
  x86: Require exact match for 'noxsave' command line option
Diffstat (limited to 'tools/perf/scripts/python/net_dropmonitor.py')
0 files changed, 0 insertions, 0 deletions
