From 2df6dabb14801eecc1ed66a56a0540bd0b3be850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 13 Apr 2012 17:18:13 +0200 Subject: [PATCH 1/6] MAINTAINERS: Fix PC file pattern MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only one pattern is allowed per F: line, split it in two. Signed-off-by: Andreas Färber Cc: Anthony Liguori --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index cce37e797f..83d3568f84 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -399,7 +399,8 @@ X86 Machines PC M: Anthony Liguori S: Supported -F: hw/pc.[ch] hw/pc_piix.c +F: hw/pc.[ch] +F: hw/pc_piix.c Xtensa Machines --------------- From aebeca25024742f311457f72d19e8f5809c159fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 13 Apr 2012 17:19:12 +0200 Subject: [PATCH 2/6] MAINTAINERS: Fix virtio-9p file pattern MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only one pattern is allowed per F: line, split in two. Signed-off-by: Andreas Färber Acked-by: Aneesh Kumar K.V --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 83d3568f84..ea327861ae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -462,7 +462,8 @@ F: hw/virtio* virtio-9p M: Aneesh Kumar K.V S: Supported -F: hw/9pfs/ fsdev/ +F: hw/9pfs/ +F: fsdev/ T: https://github.com/kvaneesh/QEMU From 8ef9cd55ad6a15eaf31c58f0b1a6f9c0e8e7c4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 13 Apr 2012 17:22:03 +0200 Subject: [PATCH 3/6] MAINTAINERS: Fix TCI file pattern MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit tcg/tci is a directory, so for recursive semantics add a trailing slash. Signed-off-by: Andreas Färber Acked-by: Stefan Weil --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index ea327861ae..7781023e71 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -638,4 +638,4 @@ F: tcg/sparc/ TCI target M: Stefan Weil S: Maintained -F: tcg/tci +F: tcg/tci/ From 1ab09a403d8c7985178abe06bfe823fc0075037f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 13 Apr 2012 18:03:42 +0200 Subject: [PATCH 4/6] MAINTAINERS: Indicate type of SCM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit T: lines are supposed to indicate whether it's git. Signed-off-by: Andreas Färber --- MAINTAINERS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7781023e71..305dbf962a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -437,7 +437,7 @@ M: Paolo Bonzini S: Supported F: hw/virtio-scsi.* F: hw/scsi* -T: git://github.com/bonzini/qemu.git scsi-next +T: git git://github.com/bonzini/qemu.git scsi-next LSI53C895A M: Paul Brook @@ -543,13 +543,13 @@ S: Odd Fixes F: block/nbd.c F: nbd.* F: qemu-nbd.c -T: git://github.com/bonzini/qemu.git nbd-next +T: git git://github.com/bonzini/qemu.git nbd-next SLIRP M: Jan Kiszka S: Maintained F: slirp/ -T: git://git.kiszka.org/qemu.git queues/slirp +T: git git://git.kiszka.org/qemu.git queues/slirp Tracing M: Stefan Hajnoczi @@ -558,7 +558,7 @@ F: trace/ F: scripts/tracetool.py F: scripts/tracetool/ F: docs/tracing.txt -T: git://github.com/stefanha/qemu.git tracing +T: git git://github.com/stefanha/qemu.git tracing Checkpatch M: Blue Swirl From 3f3309cb269c3965d6972a1a0d5f6d0c5ecdf7f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 13 Apr 2012 18:23:55 +0200 Subject: [PATCH 5/6] MAINTAINERS: Fix SCM tree for virtio-9p MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of a Web link, T: is supposed to indicate type of SCM and pullable URL, so switch to the git:// URL. Also harmonize the spacing between sections while at it. Signed-off-by: Andreas Färber Acked-by: Aneesh Kumar K.V --- MAINTAINERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 305dbf962a..9d58828a47 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -464,8 +464,7 @@ M: Aneesh Kumar K.V S: Supported F: hw/9pfs/ F: fsdev/ -T: https://github.com/kvaneesh/QEMU - +T: git git://github.com/kvaneesh/QEMU.git virtio-blk M: Kevin Wolf From aa09c9518ca6ce24e7b659503443e5f907fbd41e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 13 Apr 2012 17:52:27 +0200 Subject: [PATCH 6/6] MAINTAINERS: Document all stable trees MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We currently host stable trees for 0.10, 0.14, 0.15 and 1.0. Sort in descending order. It is expected that further non-stable sections will be added above these so this order avoids scrolling through an ever-growing list of stable trees. Signed-off-by: Andreas Färber --- MAINTAINERS | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 9d58828a47..90fe022d0a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -638,3 +638,25 @@ TCI target M: Stefan Weil S: Maintained F: tcg/tci/ + +Stable branches +--------------- +Stable 1.0 +L: qemu-stable@nongnu.org +T: git git://git.qemu.org/qemu-stable-1.0.git +S: Orphan + +Stable 0.15 +L: qemu-stable@nongnu.org +T: git git://git.qemu.org/qemu-stable-0.15.git +S: Orphan + +Stable 0.14 +L: qemu-stable@nongnu.org +T: git git://git.qemu.org/qemu-stable-0.14.git +S: Orphan + +Stable 0.10 +L: qemu-stable@nongnu.org +T: git git://git.qemu.org/qemu-stable-0.10.git +S: Orphan