[nvidia-kmod/f24: 4/4] Merge branch 'f25' into f24