[nvidia-kmod/el7: 5/5] Merge branch 'f25' into el7