Merge branch 'ibmvnic-napi-fixes'