[PATCH 0/1] MAINTAINERS: Update s390 trees

[PATCH 0/1] MAINTAINERS: Update s390 trees

[Eric Farman]

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(-)

-- 
2.51.0

[PATCH 1/1] MAINTAINERS: Update s390 trees

[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.

Signed-off-by: Eric Farman <farman@linux.ibm.com>
---
 MAINTAINERS | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index ad215eced8..cdec4872d2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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: qemu-s390x@nongnu.org
 
 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: qemu-s390x@nongnu.org
 
 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: qemu-s390x@nongnu.org
 
 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: qemu-s390x@nongnu.org
 
 S390 PCI
@@ -2468,8 +2466,6 @@ M: Eric Farman <farman@linux.ibm.com>
 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: qemu-s390x@nongnu.org
 
 virtio-dmabuf
-- 
2.51.0

Re: [PATCH 1/1] MAINTAINERS: Update s390 trees

[Christian Borntraeger]

Am 17.04.26 um 17:22 schrieb 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.
> 
> Signed-off-by: Eric Farman <farman@linux.ibm.com>

Acked-by: Christian Borntraeger <borntraeger@linux.ibm.com>

> ---
>   MAINTAINERS | 6 +-----
>   1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index ad215eced8..cdec4872d2 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -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: qemu-s390x@nongnu.org
>   
>   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: qemu-s390x@nongnu.org
>   
>   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: qemu-s390x@nongnu.org
>   
>   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: qemu-s390x@nongnu.org
>   
>   S390 PCI
> @@ -2468,8 +2466,6 @@ M: Eric Farman <farman@linux.ibm.com>
>   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: qemu-s390x@nongnu.org
>   
>   virtio-dmabuf

Re: [PATCH 1/1] MAINTAINERS: Update s390 trees

[Matthew Rosato]

On 4/17/26 11:22 AM, Eric Farman 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.
> 
> Signed-off-by: Eric Farman <farman@linux.ibm.com>

Thanks Eric.

Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>

> ---
>  MAINTAINERS | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index ad215eced8..cdec4872d2 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -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: qemu-s390x@nongnu.org
>  
>  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: qemu-s390x@nongnu.org
>  
>  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: qemu-s390x@nongnu.org
>  
>  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: qemu-s390x@nongnu.org
>  
>  S390 PCI
> @@ -2468,8 +2466,6 @@ M: Eric Farman <farman@linux.ibm.com>
>  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: qemu-s390x@nongnu.org
>  
>  virtio-dmabuf

Re: [PATCH 1/1] MAINTAINERS: Update s390 trees

[Cornelia Huck]

On Fri, Apr 17 2026, Eric Farman <farman@linux.ibm.com> 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.
>
> Signed-off-by: Eric Farman <farman@linux.ibm.com>
> ---
>  MAINTAINERS | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index ad215eced8..cdec4872d2 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -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: qemu-s390x@nongnu.org

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?

Re: [PATCH 1/1] MAINTAINERS: Update s390 trees

[Peter Maydell]

On Mon, 20 Apr 2026 at 10:52, Cornelia Huck <cohuck@redhat.com> wrote:
> 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

Re: [PATCH 1/1] MAINTAINERS: Update s390 trees

[Halil Pasic]

On Fri, 17 Apr 2026 17:22:36 +0200
Eric Farman <farman@linux.ibm.com> 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.
> 
> Signed-off-by: Eric Farman <farman@linux.ibm.com>

Acked-by: Halil Pasic <pasic@linux.ibm.com>

Re: [PATCH 1/1] MAINTAINERS: Update s390 trees

[Cornelia Huck]

On Fri, Apr 17 2026, Eric Farman <farman@linux.ibm.com> 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.
>
> Signed-off-by: Eric Farman <farman@linux.ibm.com>
> ---
>  MAINTAINERS | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)

Thanks, queued to s390-next.