qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Cornelia Huck <cornelia.huck@de.ibm.com>
To: peter.maydell@linaro.org
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>,
	borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com,
	qemu-devel@nongnu.org, agraf@suse.de
Subject: [Qemu-devel] [PULL for-2.5 04/15] MAINTAINERS: update virtio-ccw/s390 git tree
Date: Wed, 11 Nov 2015 18:56:22 +0100	[thread overview]
Message-ID: <1447264593-14625-5-git-send-email-cornelia.huck@de.ibm.com> (raw)
In-Reply-To: <1447264593-14625-1-git-send-email-cornelia.huck@de.ibm.com>

Let's reference the git branch I actually use, and add Christian's
git tree.

Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
 MAINTAINERS | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 9585a8b..9e1fa72 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -243,6 +243,8 @@ F: hw/intc/s390_flic.c
 F: hw/intc/s390_flic_kvm.c
 F: include/hw/s390x/s390_flic.h
 F: gdb-xml/s390*.xml
+T: git git://github.com/cohuck/qemu.git s390-next
+T: git git://github.com/borntraeger/qemu.git s390-next
 
 X86
 M: Paolo Bonzini <pbonzini@redhat.com>
@@ -645,7 +647,8 @@ X: hw/s390x/s390-virtio-bus.[ch]
 F: include/hw/s390x/
 F: pc-bios/s390-ccw/
 F: hw/watchdog/wdt_diag288.c
-T: git git://github.com/cohuck/qemu virtio-ccw-upstr
+T: git git://github.com/cohuck/qemu.git s390-next
+T: git git://github.com/borntraeger/qemu.git s390-next
 
 UniCore32 Machines
 -------------
@@ -872,7 +875,8 @@ M: Cornelia Huck <cornelia.huck@de.ibm.com>
 M: Christian Borntraeger <borntraeger@de.ibm.com>
 S: Supported
 F: hw/s390x/virtio-ccw.[hc]
-T: git git://github.com/cohuck/qemu virtio-ccw-upstr
+T: git git://github.com/cohuck/qemu.git s390-next
+T: git git://github.com/borntraeger/qemu.git s390-next
 
 virtio-input
 M: Gerd Hoffmann <kraxel@redhat.com>
-- 
2.6.3

  parent reply	other threads:[~2015-11-11 17:57 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-11 17:56 [Qemu-devel] [PULL for-2.5 00/15] s390x patches for 2.5 Cornelia Huck
2015-11-11 17:56 ` [Qemu-devel] [PULL for-2.5 01/15] s390x/css: sense data endianness Cornelia Huck
2015-11-11 17:56 ` [Qemu-devel] [PULL for-2.5 02/15] s390x/pci : fix up s390 pci iommu translation function Cornelia Huck
2015-11-11 17:56 ` [Qemu-devel] [PULL for-2.5 03/15] MAINTAINERS: update s390 file patterns Cornelia Huck
2015-11-11 17:56 ` Cornelia Huck [this message]
2015-11-11 17:56 ` [Qemu-devel] [PULL for-2.5 05/15] s390x: switch to memory_region_allocate_system_memory Cornelia Huck
2015-11-11 17:56 ` [Qemu-devel] [PULL for-2.5 06/15] s390x/kvm: don't enable CMMA when hugetlbfs will be used Cornelia Huck
2015-11-11 17:56 ` [Qemu-devel] [PULL for-2.5 07/15] pc-bios/s390-ccw: Always adjust virtio sector count Cornelia Huck
2015-11-11 17:56 ` [Qemu-devel] [PULL for-2.5 08/15] pc-bios/s390-ccw: ISO-9660 El Torito boot implementation Cornelia Huck
2015-11-11 17:56 ` [Qemu-devel] [PULL for-2.5 09/15] pc-bios/s390-ccw: El Torito s390x boot entry check Cornelia Huck
2015-11-11 17:56 ` [Qemu-devel] [PULL for-2.5 10/15] pc-bios/s390-ccw: El Torito 16-bit boot image size field workaround Cornelia Huck
2015-11-11 17:56 ` [Qemu-devel] [PULL for-2.5 11/15] pc-bios/s390-ccw: rebuild image Cornelia Huck
2015-11-11 17:56 ` [Qemu-devel] [PULL for-2.5 12/15] qdev: provide qdev_reset_all_fn() Cornelia Huck
2015-11-11 17:56 ` [Qemu-devel] [PULL for-2.5 13/15] s390x/ipl: clean up qom definitions and turn into TYPE_DEVICE Cornelia Huck
2015-11-11 17:56 ` [Qemu-devel] [PULL for-2.5 14/15] s390x/ipl: switch error reporting to error_setg Cornelia Huck
2015-11-11 17:56 ` [Qemu-devel] [PULL for-2.5 15/15] s390: deprecate the non-ccw machine in 2.5 Cornelia Huck
2015-11-11 23:19 ` [Qemu-devel] [PULL for-2.5 00/15] s390x patches for 2.5 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=1447264593-14625-5-git-send-email-cornelia.huck@de.ibm.com \
    --to=cornelia.huck@de.ibm.com \
    --cc=agraf@suse.de \
    --cc=borntraeger@de.ibm.com \
    --cc=jfrei@linux.vnet.ibm.com \
    --cc=peter.maydell@linaro.org \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).