Merge tag 'timers-urgent-2020-03-15' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Mar 2020 19:48:21 +0000 (12:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Mar 2020 19:48:21 +0000 (12:48 -0700)
Pull timer fix from Thomas Gleixner:
 "A single fix adding the missing time namespace adjustment in
  sys/sysinfo which caused sys/sysinfo to be inconsistent with
  /proc/uptime when read from a task inside a time namespace"

* tag 'timers-urgent-2020-03-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sys/sysinfo: Respect boottime inside time namespace


Trivial merge