Merge remote-tracking branch 'shenki/kernel-4.16.1'