From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Jul 2014 05:43:15 +0000 (-0700)
Subject: Merge tag 'trace-fixes-v3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~17576
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8dcc3be2a4fdf0560c43ae30a149ac1e4b70495f;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'trace-fixes-v3.16-rc6' of git://git./linux/kernel/git/rostedt/linux-trace

Pull trace fix from Steven Rostedt:
 "Tony Luck found that using the "uptime" trace clock that uses jiffies
  as a counter was converted to nanoseconds (silly), and after 1 hour 11
  minutes and 34 seconds, this monotonic clock would wrap, causing havoc
  with the tracing system and making the clock useless.

  He converted that clock to use jiffies_64 and made it into a counter
  instead of nanosecond conversions, and displayed the clock with the
  straight jiffy count, which works much better than it did in the past"

* tag 'trace-fixes-v3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix wraparound problems in "uptime" trace clock
---

8dcc3be2a4fdf0560c43ae30a149ac1e4b70495f