tree ac02c7e9c6776e8208275e0b4f333138438fc0ee
parent aba16dc5cf9318b4e0fe92f8261779cd9f1d2d77
parent fd991a23c8f6ef30692f77409602ccf3614353b2
author Linus Torvalds <torvalds@linux-foundation.org> 1535315945 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1535315945 -0700

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

Pull timer update from Thomas Gleixner:
 "New defines for the compat time* types so they can be shared between
  32bit and 64bit builds. Not used yet, but merging them now allows the
  actual conversions to be merged through different maintainer trees
  without dependencies

  We still have compat interfaces for 32bit on 64bit even with the new
  2038 safe timespec/val variants because pointer size is different. And
  for the old style timespec/val interfaces we need yet another 'compat'
  interface for both 32bit native and 32bit on 64bit"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  y2038: Provide aliases for compat helpers