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