[xorg-x11-drv-nvidia/el8: 2/2] Merge branch 'master' into el8