Merge branch 'ibmvnic-fixes'