[xorg-x11-drv-nvidia/f39: 6/6] Merge branch 'f40' into f39