Merge branch 'topic/timer-fixes' into for-next

Pull the fixes for possible races in the resolution callback.

Signed-off-by: Takashi Iwai <tiwai@suse.de>