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