[nvidia-kmod/el8] (2 commits) ...fix merge