[nvidia-kmod/f35: 3/3] Merge branch 'master' into f35