Merge remote-tracking branch 'clk/clk-next' into for-v4.4