Merge branch 'for-4.15/use-timer-setup' into for-linus