Skip to contentSkip to conversation

MAINTAINERS: Update s390 trees

PATCH In review Eric Farman 6 participants 8 messages Apr 17 – Apr 22

lore
Share & tools
lore
#0 lore raw

cover MAINTAINERS: Update s390 trees

Hi Conny, Christian,

With the recent movement of s390 MAINTAINERS, we noticed that the state of the s390 git trees is a bit off.

Wonder if this consolidation makes sense? Thoughts?

Eric Farman (1):
MAINTAINERS: Update s390 trees

 MAINTAINERS | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
Signature · 1 line
2.51.0
#1 lore raw

PATCH 1/1 MAINTAINERS: Update s390 trees

Move Cornelia's git tree from virtio-ccw to the overall s390 architecture group, since all the subgroups funnel up through that.

Remove Christian's tree from the subgroups, since they are not specified consistently across areas but also haven't been used in ~6 years.

---
 MAINTAINERS | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
MAINTAINERS +1 -5
index ad215eced8..cdec4872d2 100644
@@ -126,6 +126,7 @@ F: docs/system/target-s390x.rst
 F: docs/system/s390x/
 F: tests/qtest/migration/s390x/
 K: ^Subject:.*(?i)s390x?
+T: git https://gitlab.com/cohuck/qemu.git s390-next
 L: [email protected]
 
 MIPS general architecture support
@@ -500,7 +501,6 @@ F: target/s390x/kvm/
 F: target/s390x/machine.c
 F: target/s390x/sigp.c
 F: gdbstub/gdb-xml/s390*.xml
-T: git https://github.com/borntraeger/qemu.git s390-next
 L: [email protected]
 
 X86 KVM CPUs
@@ -1854,7 +1854,6 @@ F: hw/s390x/
 F: include/hw/s390x/
 F: configs/devices/s390x-softmmu/default.mak
 F: tests/functional/s390x
-T: git https://github.com/borntraeger/qemu.git s390-next
 L: [email protected]
 
 S390-ccw boot
@@ -1868,7 +1867,6 @@ F: pc-bios/s390-ccw/
 F: pc-bios/s390-ccw.img
 F: docs/devel/s390-dasd-ipl.rst
 F: tests/functional/s390x/test_pxelinux.py
-T: git https://github.com/borntraeger/qemu.git s390-next
 L: [email protected]
 
 S390 PCI
@@ -2468,8 +2466,6 @@ M: Eric Farman <[email protected]>
 S: Supported
 F: hw/s390x/virtio-ccw*.[hc]
 F: hw/s390x/vhost-*-ccw.c
-T: git https://gitlab.com/cohuck/qemu.git s390-next
-T: git https://github.com/borntraeger/qemu.git s390-next
 L: [email protected]
 
 virtio-dmabuf
Signature · 1 line
2.51.0
Acked-by on v1 1/1
#2 lore raw

Am 17.04.26 um 17:22 schrieb Eric Farman:

Quoted 9 lines

Move Cornelia's git tree from virtio-ccw to the overall s390 architecture group, since all the subgroups funnel up through that.

Remove Christian's tree from the subgroups, since they are not specified consistently across areas but also haven't been used in ~6 years.

Quoted 49 lines
---
  MAINTAINERS | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
MAINTAINERS +1 -5
index ad215eced8..cdec4872d2 100644
@@ -126,6 +126,7 @@ F: docs/system/target-s390x.rst
  F: docs/system/s390x/
  F: tests/qtest/migration/s390x/
  K: ^Subject:.*(?i)s390x?
+T: git https://gitlab.com/cohuck/qemu.git s390-next
  L: [email protected]
 
  MIPS general architecture support
@@ -500,7 +501,6 @@ F: target/s390x/kvm/
  F: target/s390x/machine.c
  F: target/s390x/sigp.c
  F: gdbstub/gdb-xml/s390*.xml
-T: git https://github.com/borntraeger/qemu.git s390-next
  L: [email protected]
 
  X86 KVM CPUs
@@ -1854,7 +1854,6 @@ F: hw/s390x/
  F: include/hw/s390x/
  F: configs/devices/s390x-softmmu/default.mak
  F: tests/functional/s390x
-T: git https://github.com/borntraeger/qemu.git s390-next
  L: [email protected]
 
  S390-ccw boot
@@ -1868,7 +1867,6 @@ F: pc-bios/s390-ccw/
  F: pc-bios/s390-ccw.img
  F: docs/devel/s390-dasd-ipl.rst
  F: tests/functional/s390x/test_pxelinux.py
-T: git https://github.com/borntraeger/qemu.git s390-next
  L: [email protected]
 
  S390 PCI
@@ -2468,8 +2466,6 @@ M: Eric Farman <[email protected]>
  S: Supported
  F: hw/s390x/virtio-ccw*.[hc]
  F: hw/s390x/vhost-*-ccw.c
-T: git https://gitlab.com/cohuck/qemu.git s390-next
-T: git https://github.com/borntraeger/qemu.git s390-next
  L: [email protected]
 
  virtio-dmabuf
Reviewed-by on v1 1/1
#3 lore raw
In reply to Eric Farman
Quoted 9 lines · Eric Farman

Move Cornelia's git tree from virtio-ccw to the overall s390 architecture group, since all the subgroups funnel up through that.

Remove Christian's tree from the subgroups, since they are not specified consistently across areas but also haven't been used in ~6 years.

Thanks Eric.

Quoted 49 lines
---
 MAINTAINERS | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
MAINTAINERS +1 -5
index ad215eced8..cdec4872d2 100644
@@ -126,6 +126,7 @@ F: docs/system/target-s390x.rst
 F: docs/system/s390x/
 F: tests/qtest/migration/s390x/
 K: ^Subject:.*(?i)s390x?
+T: git https://gitlab.com/cohuck/qemu.git s390-next
 L: [email protected]
 
 MIPS general architecture support
@@ -500,7 +501,6 @@ F: target/s390x/kvm/
 F: target/s390x/machine.c
 F: target/s390x/sigp.c
 F: gdbstub/gdb-xml/s390*.xml
-T: git https://github.com/borntraeger/qemu.git s390-next
 L: [email protected]
 
 X86 KVM CPUs
@@ -1854,7 +1854,6 @@ F: hw/s390x/
 F: include/hw/s390x/
 F: configs/devices/s390x-softmmu/default.mak
 F: tests/functional/s390x
-T: git https://github.com/borntraeger/qemu.git s390-next
 L: [email protected]
 
 S390-ccw boot
@@ -1868,7 +1867,6 @@ F: pc-bios/s390-ccw/
 F: pc-bios/s390-ccw.img
 F: docs/devel/s390-dasd-ipl.rst
 F: tests/functional/s390x/test_pxelinux.py
-T: git https://github.com/borntraeger/qemu.git s390-next
 L: [email protected]
 
 S390 PCI
@@ -2468,8 +2466,6 @@ M: Eric Farman <[email protected]>
 S: Supported
 F: hw/s390x/virtio-ccw*.[hc]
 F: hw/s390x/vhost-*-ccw.c
-T: git https://gitlab.com/cohuck/qemu.git s390-next
-T: git https://github.com/borntraeger/qemu.git s390-next
 L: [email protected]
 
 virtio-dmabuf
#4 lore raw
In reply to Eric Farman
Quoted 18 lines · Eric Farman

Move Cornelia's git tree from virtio-ccw to the overall s390 architecture group, since all the subgroups funnel up through that.

Remove Christian's tree from the subgroups, since they are not specified consistently across areas but also haven't been used in ~6 years.

---
 MAINTAINERS | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
MAINTAINERS +0 -0
index ad215eced8..cdec4872d2 100644

MAINTAINERS F: docs/system/target-s390x.rst · line 130

Quoted 5 lines
MAINTAINERS +1 -0
@@ -126,6 +126,7 @@ F: docs/system/target-s390x.rst
 F: docs/system/s390x/
 F: tests/qtest/migration/s390x/
 K: ^Subject:.*(?i)s390x?
+T: git https://gitlab.com/cohuck/qemu.git s390-next
 L: [email protected]

Makes sense, I guess.

I also have the s390-fixes branch, which I've used during freeze, not sure if it is worth mentioning here as well. (Assuming that I'll continue using the same setup as in the past, but it had been working well back then.)

In general, do humans tend to consult the T: lines? Are there tools that do anyting interesting with them?

#5 lore raw
Quoted 7 lines · Cornelia Huck

I also have the s390-fixes branch, which I've used during freeze, not sure if it is worth mentioning here as well. (Assuming that I'll continue using the same setup as in the past, but it had been working well back then.)

In general, do humans tend to consult the T: lines? Are there tools that do anyting interesting with them?

I never look at the T: lines. My impression is that this is a part of the MAINTAINERS format that we've carried over from Linux, where the development workflow is much more that subsystems have their own git trees and patches for those subsystems should be based on those git trees, because the mainline git is only updated during a merge window. For QEMU our workflow is that patches for anywhere in the tree should be based on the head of upstream git, because that continually updates except during release freezes. So there's much less need to care about what a subsystem's git tree is, and many subsystems don't have a public git tree at all.

-- PMM

Acked-by on v1 1/1
#6 lore raw
In reply to Eric Farman
Quoted 9 lines · On Fri, 17 Apr 2026 17:22:36 +0200 Eric Farman <[email protected]> wrote:

Move Cornelia's git tree from virtio-ccw to the overall s390 architecture group, since all the subgroups funnel up through that.

Remove Christian's tree from the subgroups, since they are not specified consistently across areas but also haven't been used in ~6 years.

#7 lore raw
In reply to Eric Farman
Quoted 4 lines · Eric Farman

Move Cornelia's git tree from virtio-ccw to the overall s390 architecture group, since all the subgroups funnel up through that.

Quoted 8 lines

Remove Christian's tree from the subgroups, since they are not specified consistently across areas but also haven't been used in ~6 years.

---
 MAINTAINERS | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Thanks, queued to s390-next.