Merge tag 'v4.14-rc6' into next

Merge with mainline to bring in the timer API changes.