Merge branch 'ibmvnic-coding-style'