[nvidia-kmod/el7] (28 commits) ...fix merge