From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 Apr 2018 23:18:31 +0000 (-0700)
Subject: Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.17-rc1~169
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5532439ebab93e47784effb96aafa7d7ba4b760;p=thirdparty%2Fkernel%2Flinux.git

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

Pull x86 timer updates from Ingo Molnar:
 "Two changes: add the new convert_art_ns_to_tsc() API for upcoming
  Intel Goldmont+ drivers, and remove the obsolete rdtscll() API"

* 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/tsc: Get rid of rdtscll()
  x86/tsc: Convert ART in nanoseconds to TSC
---

a5532439ebab93e47784effb96aafa7d7ba4b760