[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 0/7] xen-140507
From: |
Stefano Stabellini |
Subject: |
Re: [Qemu-devel] [PULL 0/7] xen-140507 |
Date: |
Wed, 7 May 2014 17:19:27 +0100 |
User-agent: |
Alpine 2.02 (DEB 1266 2009-07-14) |
On Wed, 7 May 2014, Peter Maydell wrote:
> On 7 May 2014 16:09, Stefano Stabellini
> <address@hidden> wrote:
> > The following changes since commit 951916d02c59cd0eddd57c3d66f87f921931e394:
> >
> > Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-6' into
> > staging (2014-05-06 13:06:32 +0100)
> >
> > are available in the git repository at:
> >
> >
> > git://xenbits.xen.org/people/sstabellini/qemu-dm.git xen-140507
> >
> > for you to fetch changes up to 6a16be0810eccd3aede1ef592c3c1b64430b3280:
> >
> > xen_disk: add discard support (2014-05-07 14:56:54 +0000)
>
> Hi; I'm afraid I get merge conflicts when I pull this:
> >From git://xenbits.xen.org/people/sstabellini/qemu-dm
> * [new branch] xen-140507 -> sstabellini/xen-140507
> merging...
> Auto-merging xen-hvm.c
> CONFLICT (content): Merge conflict in xen-hvm.c
> Auto-merging xen-hvm-stub.c
> CONFLICT (content): Merge conflict in xen-hvm-stub.c
> Automatic merge failed; fix conflicts and then commit the result.
>
> It looks like they're pretty trivial, but since this pull involves
> file renames and I have no way to test Xen, I'd appreciate
> it if you could reroll the pull request.
Sure
- Re: [Qemu-devel] [PULL 1/7] exec: Limit translation limiting in address_space_translate to xen, (continued)
[Qemu-devel] [PULL 3/7] xen: move Xen PV machine files to hw/xenpv, Stefano Stabellini, 2014/05/07
[Qemu-devel] [PULL 4/7] xen: move Xen HVM files under hw/i386/xen, Stefano Stabellini, 2014/05/07
[Qemu-devel] [PULL 7/7] xen_disk: add discard support, Stefano Stabellini, 2014/05/07
[Qemu-devel] [PULL 5/7] xen: factor out common functions, Stefano Stabellini, 2014/05/07
Re: [Qemu-devel] [PULL 0/7] xen-140507, Peter Maydell, 2014/05/07
- Re: [Qemu-devel] [PULL 0/7] xen-140507,
Stefano Stabellini <=