[xorg-x11-drv-nvidia/f36: 10/10] Merge master