Merge branch 'v4.12/defconfig' into davinci-reset