[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL v5] pci, pc, virtio fixes and cleanups
From: |
Michael S. Tsirkin |
Subject: |
Re: [Qemu-devel] [PULL v5] pci, pc, virtio fixes and cleanups |
Date: |
Sat, 7 Mar 2015 19:00:58 +0100 |
On Fri, Mar 06, 2015 at 05:15:59PM +0100, Markus Armbruster wrote:
> Igor Mammedov <address@hidden> writes:
>
> > On Fri, 06 Mar 2015 15:27:07 +0100
> > Markus Armbruster <address@hidden> wrote:
> >
> >> "Michael S. Tsirkin" <address@hidden> writes:
> >>
> >> > Sorry about all the problems.
> >> > Same as v4, but updated generated files for non-iasl systems.
> >> > Not re-sending the patches therefore.
> >> >
> >> > The following changes since commit
> >> > 11d39a131020cc5c54ff9bc86d3259f7d32bf849:
> >> >
> >> > Merge remote-tracking branch
> >> > remotes/borntraeger/tags/s390x-20150218' into staging (2015-02-26
> >> > 09:08:54 +0000)
> >> >
> >> > are available in the git repository at:
> >> >
> >> > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
> >> >
> >> > for you to fetch changes up to 09d219a31cf87ed98150c0a9e772e54f470f2a01:
> >> >
> >> > acpi: update generated files (2015-03-04 16:05:32 +0100)
> >>
> >> I tried to base work on this branch, and ran into trouble:
> >>
> >> $ git-checkout master
> >> error: The following untracked working tree files would be overwritten
> >> by checkout:
> >> hw/i386/acpi-dsdt-pci-crs.dsl
> >> hw/i386/ssdt-mem.dsl
> >> hw/i386/ssdt-mem.hex.generated
> >> hw/i386/ssdt-misc.dsl
> >> hw/i386/ssdt-misc.hex.generated
> >> hw/i386/ssdt-pcihp.dsl
> >> hw/i386/ssdt-pcihp.hex.generated
> >> hw/i386/ssdt-proc.dsl
> >> hw/i386/ssdt-proc.hex.generated
> > Above files are being removed from source tree by commits in this pull
> > request
> > none of them should exist after pull request applied
>
> They did after merging the pull request locally, resolving the trivial
> conflict with "git-rm hw/pci/pci-hotplug-old.c", running make (fail),
> blowing away the build tree, running make again (success), git-commit
> -a.
>
> Except I can't reproduce it now. I have no idea what freak accident put
> them in my source tree.
>
> Sorry for the noise.
>
> [...]
OK, good to know.
So I'm not redoing the pull request, waiting for Peter to apply this
one.
--
MST
- Re: [Qemu-devel] [PULL v5] pci, pc, virtio fixes and cleanups, (continued)
- Re: [Qemu-devel] [PULL v5] pci, pc, virtio fixes and cleanups, Peter Maydell, 2015/03/06
- Re: [Qemu-devel] [PULL v5] pci, pc, virtio fixes and cleanups, Markus Armbruster, 2015/03/06
- Re: [Qemu-devel] [PULL v5] pci, pc, virtio fixes and cleanups, Michael S. Tsirkin, 2015/03/07
- Re: [Qemu-devel] [PULL v5] pci, pc, virtio fixes and cleanups, Michael S. Tsirkin, 2015/03/07
- Re: [Qemu-devel] [PULL v5] pci, pc, virtio fixes and cleanups, Peter Maydell, 2015/03/07
- Re: [Qemu-devel] [PULL v5] pci, pc, virtio fixes and cleanups, Michael S. Tsirkin, 2015/03/08
- Re: [Qemu-devel] [PULL v5] pci, pc, virtio fixes and cleanups, Peter Maydell, 2015/03/08
- Re: [Qemu-devel] [PULL v5] pci, pc, virtio fixes and cleanups, Michael S. Tsirkin, 2015/03/08
Re: [Qemu-devel] [PULL v5] pci, pc, virtio fixes and cleanups, Igor Mammedov, 2015/03/06
Re: [Qemu-devel] [PULL v5] pci, pc, virtio fixes and cleanups, Michael S. Tsirkin, 2015/03/07