[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH v4 for-2.3 00/25] hw/pc: implement multiple prim

From: Gerd Hoffmann
Subject: Re: [Qemu-devel] [PATCH v4 for-2.3 00/25] hw/pc: implement multiple primary busses for pc machines
Date: Mon, 09 Mar 2015 11:18:43 +0100

On Mo, 2015-03-09 at 11:20 +0200, Marcel Apfelbaum wrote:
> On 03/09/2015 09:43 AM, Gerd Hoffmann wrote:
> > On So, 2015-03-08 at 13:16 +0200, Marcel Apfelbaum wrote:
> >> Notes:
> >>   - Sorry for the late submission, I was waiting for dynamic ACPI series 
> >> to get merged
> >>     in order to submit - my bad.
> >>   - The prev version (v2) was wrongfully tagged by me as RFC, it was 
> >> actually ready but not
> >>     rebased. V3 only rebases with no actual functionality changed.
> >>   - This series is not that big, patches 1-8 are really small and can be 
> >> submitted
> >>     separately, however I preferred to keep them here to get the whole 
> >> picture.
> >
> > Which tree this does apply against?
> > Do you have a git tree with this somewhere?
> Michael's pci branch of:
> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git

Hmm, not working for me ...

nilsson kraxel ~/projects/qemu ((a3b66ab...))# git checkout -b testing
M       roms/seabios
Branch testing set up to track remote branch pci from mst.
Switched to a new branch 'testing'
nilsson kraxel ~/projects/qemu (testing)# git am -s
Applying: acpi: fix aml_equal term implementation
error: patch failed: hw/acpi/aml-build.c:542
error: hw/acpi/aml-build.c: patch does not apply
Patch failed at 0001 acpi: fix aml_equal term implementation
The copy of the patch that failed is found in:
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
nilsson kraxel ~/projects/qemu (testing|AM 1/25)# 


reply via email to

[Prev in Thread] Current Thread [Next in Thread]