[nvidia-kmod/f38: 2/2] Merge branch 'f39' into f38