some non-trivial updates in 0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch automatic git rebase otherwise