tree 9860f04d4ddbb527d068493c233d2a2ed373b1e9
parent 14e07f023ff6ed3e38850a9935a05b0b8e52fa49
parent 88d879d29f9cc0de2d930b584285638cdada6625
author Linus Torvalds <torvalds@linux-foundation.org> 1493577858 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1493577858 -0700

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

Pull x86 fixes from Thomas Gleixner:
 "The final fixes for 4.11:

   - prevent a triple fault with function graph tracing triggered via
     suspend to ram

   - prevent optimizing for size when function graph tracing is enabled
     and the compiler does not support -mfentry

   - prevent mwaitx() being called with a zero timeout as mwaitx() might
     never return. Observed on the new Ryzen CPUs"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  Prevent timer value 0 for MWAITX
  x86/build: convert function graph '-Os' error to warning
  ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram