[nvidia-xconfig/el8: 11/11] Merge branch 'f36' into el8