On 03/02/12 14:59, Marc-André Lureau wrote: > On Fri, Mar 2, 2012 at 2:25 PM, Gerd Hoffmann <kra...@redhat.com> wrote: >> On 03/02/12 13:49, Marc-André Lureau wrote: >>> This allows a Spice client to identify a VM >> >> Patch doesn't apply, please rebase. > > It applies here on top of git://git.qemu.org/qemu.git/master: > > commit 88e6c60671df4c8b1b6c1eb8f76950ab1bea0ec2 > Merge: 14655e4 8f6f962 > Author: Anthony Liguori <aligu...@us.ibm.com> > Date: Thu Mar 1 15:26:55 2012 -0600 > > Merge remote-tracking branch 'qemu-kvm/memory/urgent' into staging >
No: rincewind kraxel ~/projects/qemu (tmp)# git am -s ~/Downloads/patches/spice/\[Qemu-devel\]\ \[PATCH\]\ spice\:\ set\ spice\ uuid\ and\ name.eml Applying: spice: set spice uuid and name error: patch failed: ui/spice-core.c:699 error: ui/spice-core.c: patch does not apply Patch failed at 0001 spice: set spice uuid and name When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". And please wait until the spice-server changes this patch depends on are committed upstream before resubmitting. thanks, Gerd
