From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:39939)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1S3TBu-0005gQ-3P
	for qemu-devel@nongnu.org; Fri, 02 Mar 2012 09:10:51 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1S3TBs-00014X-6e
	for qemu-devel@nongnu.org; Fri, 02 Mar 2012 09:10:37 -0500
Received: from mx1.redhat.com ([209.132.183.28]:4894)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1S3TBr-00014K-Vj
	for qemu-devel@nongnu.org; Fri, 02 Mar 2012 09:10:36 -0500
Message-ID: <4F50D4D7.8010602@redhat.com>
Date: Fri, 02 Mar 2012 15:10:31 +0100
From: Gerd Hoffmann <kraxel@redhat.com>
MIME-Version: 1.0
References: <1330692562-21943-1-git-send-email-marcandre.lureau@redhat.com>
	<4F50CA51.6070101@redhat.com>
	<CAJ+F1CJAtGnSo37SXx3gPWcRLCyHoV0-pRK0bduCLrMKQGv-Dg@mail.gmail.com>
In-Reply-To: <CAJ+F1CJAtGnSo37SXx3gPWcRLCyHoV0-pRK0bduCLrMKQGv-Dg@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH] spice: set spice uuid and name
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: =?ISO-8859-1?Q?Marc-Andr=E9_Lureau?= <marcandre.lureau@gmail.com>
Cc: =?ISO-8859-1?Q?Marc-Andr=E9_Lureau?= <marcandre.lureau@redhat.com>, qemu-devel@nongnu.org

On 03/02/12 14:59, Marc-Andr=E9 Lureau wrote:
> On Fri, Mar 2, 2012 at 2:25 PM, Gerd Hoffmann <kraxel@redhat.com> wrote=
:
>> On 03/02/12 13:49, Marc-Andr=E9 Lureau wrote:
>>> This allows a Spice client to identify a VM
>>
>> Patch doesn't apply, please rebase.
>=20
> It applies here on top of git://git.qemu.org/qemu.git/master:
>=20
> commit 88e6c60671df4c8b1b6c1eb8f76950ab1bea0ec2
> Merge: 14655e4 8f6f962
> Author: Anthony Liguori <aliguori@us.ibm.com>
> Date:   Thu Mar 1 15:26:55 2012 -0600
>=20
>     Merge remote-tracking branch 'qemu-kvm/memory/urgent' into staging
>=20

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