From: Paolo Bonzini <pbonzini@redhat.com>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: qemu-devel@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>
Subject: Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
Date: Wed, 19 Dec 2012 16:32:03 +0100 [thread overview]
Message-ID: <50D1DDF3.6090307@redhat.com> (raw)
In-Reply-To: <87mwxbf0is.fsf@codemonkey.ws>
Il 18/12/2012 23:39, Anthony Liguori ha scritto:
>> > And how does it conflicts with Alex's ppc pull request? It is a fast
>> > forward from origin/master as of now (commit a8a826a, exec: refactor
>> > cpu_restore_state, 2012-12-04), and that includes Alex's commits...
> Something from the e500 changes because hw/ppc/e500.c and
> hw/ppc/e500plat.c broke after the merge.
>
> But since it was the wrong tree, maybe your new branch will not have
> this problem.
>
> It was easy to fix, so don't worry about it. I can resolve as a merge
> conflict if needed.
Pushed.
Paolo
next prev parent reply other threads:[~2012-12-19 15:32 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 01/32] libcacard: simplify rules for recursive build Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 02/32] vscclient: use per-target variables Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 03/32] build: adjust setting of QEMU_INCLUDES Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 05/32] build: move rules from Makefile to */Makefile.objs Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 06/32] build: create ldscripts/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 07/32] build: kill libdis, move disassemblers to disas/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 08/32] build: kill libuser Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 09/32] janitor: do not rely on indirect inclusions of or from qemu-char.h Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 10/32] janitor: do not include qemu-char everywhere Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 11/32] net: move Bluetooth stuff out of net.h Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 12/32] net: do not include net.h everywhere Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 13/32] net: move net.c to net/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 14/32] net: reorganize headers Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 15/32] qemu-ga: move qemu-ga files to qga/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 16/32] ui: move files to ui/ and include/ui/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 17/32] qapi: move inclusions of qemu-common.h from headers to .c files Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 18/32] qapi: remove qapi/qapi-types-core.h Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 19/32] qapi: make struct Visitor opaque Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 20/32] janitor: add guards to headers Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 21/32] qapi: move include files to include/qobject/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 22/32] block: move include files to include/block/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 23/32] exec: move include files to include/exec/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 24/32] monitor: move include files to include/monitor/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 25/32] migration: move include files to include/migration/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 26/32] qom: move include files to include/qom/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 27/32] misc: move include files to include/qemu/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 28/32] softmmu: move include files to include/sysemu/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 29/32] softmmu: move remaining include files to include/ subdirectories Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 30/32] fpu: move public header file to include/fpu Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 31/32] hw: move executable format header files to hw/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 32/32] janitor: move remaining public headers to include/ Paolo Bonzini
2012-12-18 20:59 ` [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Anthony Liguori
2012-12-18 21:11 ` Paolo Bonzini
2012-12-18 21:56 ` Paolo Bonzini
2012-12-18 22:35 ` Anthony Liguori
2012-12-18 22:47 ` Michael S. Tsirkin
2012-12-18 23:36 ` Anthony Liguori
2012-12-18 22:01 ` Paolo Bonzini
2012-12-18 22:39 ` Anthony Liguori
2012-12-19 15:32 ` Paolo Bonzini [this message]
2012-12-19 0:13 ` Anthony Liguori
2012-12-19 2:00 ` Anthony Liguori
2012-12-19 2:13 ` Alexander Graf
2012-12-19 2:18 ` David Gibson
2012-12-19 8:35 ` Paolo Bonzini
2012-12-19 20:02 ` Blue Swirl
2012-12-19 19:45 ` Michael S. Tsirkin
2012-12-19 6:14 ` Michael S. Tsirkin
2012-12-20 0:54 ` Anthony Liguori
2012-12-20 11:12 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50D1DDF3.6090307@redhat.com \
--to=pbonzini@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.