[nvidia-open-kmod/f40: 6/6] Merge branch 'master' into f40