[Qemu-devel] [PULL 0/6] Fixes for the MAINTAINERS file

[Qemu-devel] [PULL 0/6] Fixes for the MAINTAINERS file

[Thomas Huth]

The following changes since commit 9b4b0350264d8164996265d635c8b9599673afb4:

  Merge remote-tracking branch 'public/tags/tracing-pull-request' into staging (2016-11-09 12:44:16 +0000)

are available in the git repository at:


  https://github.com/huth/qemu.git tags/maintainers-20161110

for you to fetch changes up to 275196e9a2b13e3e24fd6cf638c02a6454071b8a:

  MAINTAINERS: Remove obsolete stable branches (2016-11-10 10:27:19 +0100)

----------------------------------------------------------------
Fixes for the MAINTAINERS file for QEMU 2.8

----------------------------------------------------------------
John Snow (1):
      MAINTAINERS: Add Fam and Jsnow for Bitmap support

Thomas Huth (5):
      MAINTAINERS: Add some ARM related files to the corresponding sections
      sparc: Add slavio_misc.c and eccmemctl.c to the MAINTAINERS file
      m68k: Update the 68k sections in the MAINTAINERS file
      MAINTAINERS: Add an entry for the CHRP NVRAM files
      MAINTAINERS: Remove obsolete stable branches

 MAINTAINERS | 59 +++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 24 deletions(-)

-- 
1.8.3.1

[Qemu-devel] [PULL 1/6] MAINTAINERS: Add some ARM related files to the corresponding sections

[Thomas Huth]

The files w/cpu/a*mpcore.c are already assigned to the ARM CPU
section, but the corresponding headers include/hw/cpu/a*mpcore.h
are still missing.

The file hw/*/imx* are already assigned to the i.MX31 machine, but
the corresponding header files include/hw/*/imx* are still missing.

The file hw/misc/arm_integrator_debug.c seems to belong to Integrator
CP, hw/cpu/realview_mpcore.c seems to belong to Real View, and
hw/misc/mst_fpga.c seems to belong to PXA2XX.

And the files hw/misc/zynq* and include/hw/misc/zynq* seem to belong
to the Xilinx Zynq machine.

Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 MAINTAINERS | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 82c814a..d7eef43 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -118,6 +118,7 @@ S: Maintained
 F: target-arm/
 F: hw/arm/
 F: hw/cpu/a*mpcore.c
+F: include/hw/cpu/a*mpcore.h
 F: disas/arm.c
 F: disas/arm-a64.cc
 F: disas/libvixl/
@@ -420,6 +421,7 @@ M: Peter Chubb <peter.chubb@nicta.com.au>
 L: qemu-arm@nongnu.org
 S: Odd fixes
 F: hw/*/imx*
+F: include/hw/*/imx*
 F: hw/arm/kzm.c
 F: include/hw/arm/fsl-imx31.h
 
@@ -428,6 +430,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
 L: qemu-arm@nongnu.org
 S: Maintained
 F: hw/arm/integratorcp.c
+F: hw/misc/arm_integrator_debug.c
 
 Musicpal
 M: Jan Kiszka <jan.kiszka@web.de>
@@ -452,6 +455,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
 L: qemu-arm@nongnu.org
 S: Maintained
 F: hw/arm/realview*
+F: hw/cpu/realview_mpcore.c
 F: hw/intc/realview_gic.c
 F: include/hw/intc/realview_gic.h
 
@@ -464,6 +468,7 @@ F: hw/arm/spitz.c
 F: hw/arm/tosa.c
 F: hw/arm/z2.c
 F: hw/*/pxa2xx*
+F: hw/misc/mst_fpga.c
 F: include/hw/arm/pxa.h
 
 Stellaris
@@ -485,7 +490,8 @@ L: qemu-arm@nongnu.org
 S: Maintained
 F: hw/*/xilinx_*
 F: hw/*/cadence_*
-F: hw/misc/zynq_slcr.c
+F: hw/misc/zynq*
+F: include/hw/misc/zynq*
 X: hw/ssi/xilinx_*
 
 Xilinx ZynqMP
-- 
1.8.3.1

[Qemu-devel] [PULL 2/6] sparc: Add slavio_misc.c and eccmemctl.c to the MAINTAINERS file

[Thomas Huth]

Both files seem to belong to the Sun4m machine.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 MAINTAINERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index d7eef43..451e7cc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -710,6 +710,8 @@ S: Maintained
 F: hw/sparc/sun4m.c
 F: hw/dma/sparc32_dma.c
 F: hw/dma/sun4m_iommu.c
+F: hw/misc/eccmemctl.c
+F: hw/misc/slavio_misc.c
 F: include/hw/sparc/sparc32_dma.h
 F: include/hw/sparc/sun4m.h
 F: pc-bios/openbios-sparc32
-- 
1.8.3.1

[Qemu-devel] [PULL 3/6] m68k: Update the 68k sections in the MAINTAINERS file

[Thomas Huth]

disas/m68k.c obviously belong to the m68k CPU section in
the MAINTAINERS file, but remove the hw/m68k/ directory
here since it only contains machine (not CPU) related
files, as requested by Laurent. Add the machine related
files to the right machine sections instead.

Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 MAINTAINERS | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 451e7cc..5d8b584 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -148,7 +148,7 @@ M68K
 M: Laurent Vivier <laurent@vivier.eu>
 S: Maintained
 F: target-m68k/
-F: hw/m68k/
+F: disas/m68k.c
 
 MicroBlaze
 M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
@@ -550,6 +550,7 @@ M68K Machines
 an5206
 S: Orphan
 F: hw/m68k/an5206.c
+F: hw/m68k/mcf5206.c
 
 dummy_m68k
 S: Orphan
@@ -558,6 +559,9 @@ F: hw/m68k/dummy_m68k.c
 mcf5208
 S: Orphan
 F: hw/m68k/mcf5208.c
+F: hw/m68k/mcf_intc.c
+F: hw/char/mcf_uart.c
+F: hw/net/mcf_fec.c
 
 MicroBlaze Machines
 -------------------
-- 
1.8.3.1

[Qemu-devel] [PULL 4/6] MAINTAINERS: Add an entry for the CHRP NVRAM files

[Thomas Huth]

I recently added new files to the source tree that are not
covered by any maintainer yet -- and since every new source
file should have a maintainer nowadays, I volunteer to look
after these files now, too.

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 MAINTAINERS | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 5d8b584..05b1c97 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1093,6 +1093,13 @@ S: Maintained
 F: hw/core/generic-loader.c
 F: include/hw/core/generic-loader.h
 
+CHRP NVRAM
+M: Thomas Huth <thuth@redhat.com>
+S: Maintained
+F: hw/nvram/chrp_nvram.c
+F: include/hw/nvram/chrp_nvram.h
+F: tests/prom-env-test.c
+
 Subsystems
 ----------
 Audio
-- 
1.8.3.1

[Qemu-devel] [PULL 5/6] MAINTAINERS: Add Fam and Jsnow for Bitmap support

[Thomas Huth]

From: John Snow <jsnow@redhat.com>

These files are currently unmaintained.

I'm proposing that Fam and I co-maintain them; under the model that
whomever between us isn't authoring a given series will be responsible
for reviewing it.

Signed-off-by: John Snow <jsnow@redhat.com>
Acked-by: Fam Zheng <famz@redhat.com>
Acked-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 MAINTAINERS | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 05b1c97..d8575ab 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1158,6 +1158,20 @@ F: block/qapi.c
 F: qapi/block*.json
 T: git git://repo.or.cz/qemu/armbru.git block-next
 
+Dirty Bitmaps
+M: Fam Zheng <famz@redhat.com>
+M: John Snow <jsnow@redhat.com>
+L: qemu-block@nongnu.org
+S: Supported
+F: util/hbitmap.c
+F: block/dirty-bitmap.c
+F: include/qemu/hbitmap.h
+F: include/block/dirty-bitmap.h
+F: tests/test-hbitmap.c
+F: docs/bitmaps.md
+T: git git://github.com/famz/qemu.git bitmaps
+T: git git://github.com/jnsnow/qemu.git bitmaps
+
 Character device backends
 M: Paolo Bonzini <pbonzini@redhat.com>
 S: Maintained
-- 
1.8.3.1

[Qemu-devel] [PULL 6/6] MAINTAINERS: Remove obsolete stable branches

[Thomas Huth]

There are only very old and orphaned stable branches listed
in the MAINTAINERS file - so this section is pretty useless
nowadays. Let's remove it.

Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 MAINTAINERS | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index d8575ab..4a60579 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1574,28 +1574,6 @@ F: tcg/tci/
 F: tci.c
 F: disas/tci.c
 
-Stable branches
----------------
-Stable 1.0
-L: qemu-stable@nongnu.org
-T: git git://git.qemu-project.org/qemu-stable-1.0.git
-S: Orphan
-
-Stable 0.15
-L: qemu-stable@nongnu.org
-T: git git://git.qemu-project.org/qemu-stable-0.15.git
-S: Orphan
-
-Stable 0.14
-L: qemu-stable@nongnu.org
-T: git git://git.qemu-project.org/qemu-stable-0.14.git
-S: Orphan
-
-Stable 0.10
-L: qemu-stable@nongnu.org
-T: git git://git.qemu-project.org/qemu-stable-0.10.git
-S: Orphan
-
 Block drivers
 -------------
 VMDK
-- 
1.8.3.1

Re: [Qemu-devel] [PULL 6/6] MAINTAINERS: Remove obsolete stable branches

[Michael S. Tsirkin]

On Thu, Nov 10, 2016 at 11:11:43AM +0100, Thomas Huth wrote:
> There are only very old and orphaned stable branches listed
> in the MAINTAINERS file - so this section is pretty useless
> nowadays. Let's remove it.
> 
> Reviewed-by: John Snow <jsnow@redhat.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>


Could you add some kind of entry for stable though?
Otherwise people won't know which address to CC.

> ---
>  MAINTAINERS | 22 ----------------------
>  1 file changed, 22 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index d8575ab..4a60579 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1574,28 +1574,6 @@ F: tcg/tci/
>  F: tci.c
>  F: disas/tci.c
>  
> -Stable branches
> ----------------
> -Stable 1.0
> -L: qemu-stable@nongnu.org
> -T: git git://git.qemu-project.org/qemu-stable-1.0.git
> -S: Orphan
> -
> -Stable 0.15
> -L: qemu-stable@nongnu.org
> -T: git git://git.qemu-project.org/qemu-stable-0.15.git
> -S: Orphan
> -
> -Stable 0.14
> -L: qemu-stable@nongnu.org
> -T: git git://git.qemu-project.org/qemu-stable-0.14.git
> -S: Orphan
> -
> -Stable 0.10
> -L: qemu-stable@nongnu.org
> -T: git git://git.qemu-project.org/qemu-stable-0.10.git
> -S: Orphan
> -
>  Block drivers
>  -------------
>  VMDK
> -- 
> 1.8.3.1
> 

Re: [Qemu-devel] [PULL 6/6] MAINTAINERS: Remove obsolete stable branches

[Thomas Huth]

On 10.01.2017 04:32, Michael S. Tsirkin wrote:
> On Thu, Nov 10, 2016 at 11:11:43AM +0100, Thomas Huth wrote:
>> There are only very old and orphaned stable branches listed
>> in the MAINTAINERS file - so this section is pretty useless
>> nowadays. Let's remove it.
>>
>> Reviewed-by: John Snow <jsnow@redhat.com>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
> 
> 
> Could you add some kind of entry for stable though?
> Otherwise people won't know which address to CC.

I think that's a question to Michael Roth - whether such an entry should
be added and how it should look like.

 Thomas


>> ---
>>  MAINTAINERS | 22 ----------------------
>>  1 file changed, 22 deletions(-)
>>
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index d8575ab..4a60579 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -1574,28 +1574,6 @@ F: tcg/tci/
>>  F: tci.c
>>  F: disas/tci.c
>>  
>> -Stable branches
>> ----------------
>> -Stable 1.0
>> -L: qemu-stable@nongnu.org
>> -T: git git://git.qemu-project.org/qemu-stable-1.0.git
>> -S: Orphan
>> -
>> -Stable 0.15
>> -L: qemu-stable@nongnu.org
>> -T: git git://git.qemu-project.org/qemu-stable-0.15.git
>> -S: Orphan
>> -
>> -Stable 0.14
>> -L: qemu-stable@nongnu.org
>> -T: git git://git.qemu-project.org/qemu-stable-0.14.git
>> -S: Orphan
>> -
>> -Stable 0.10
>> -L: qemu-stable@nongnu.org
>> -T: git git://git.qemu-project.org/qemu-stable-0.10.git
>> -S: Orphan
>> -
>>  Block drivers
>>  -------------
>>  VMDK
>> -- 
>> 1.8.3.1
>>

Re: [Qemu-devel] [PULL 6/6] MAINTAINERS: Remove obsolete stable branches

[Michael Roth]

Quoting Thomas Huth (2017-01-10 01:54:40)
> On 10.01.2017 04:32, Michael S. Tsirkin wrote:
> > On Thu, Nov 10, 2016 at 11:11:43AM +0100, Thomas Huth wrote:
> >> There are only very old and orphaned stable branches listed
> >> in the MAINTAINERS file - so this section is pretty useless
> >> nowadays. Let's remove it.
> >>
> >> Reviewed-by: John Snow <jsnow@redhat.com>
> >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> > 
> > 
> > Could you add some kind of entry for stable though?
> > Otherwise people won't know which address to CC.
> 
> I think that's a question to Michael Roth - whether such an entry should
> be added and how it should look like.

Hmm, not sure how to make this very readable. Something like this
perhaps?

Stable branches
---------------
Current M.(N-1) Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.9.0)
M: Michael Roth <mdroth@linux.vnet.ibm.com>
L: qemu-stable@nongnu.org
T: git git://git.qemu-project.org/qemu.git stable-M.(N-1)
S: Supported

> 
>  Thomas
> 
> 
> >> ---
> >>  MAINTAINERS | 22 ----------------------
> >>  1 file changed, 22 deletions(-)
> >>
> >> diff --git a/MAINTAINERS b/MAINTAINERS
> >> index d8575ab..4a60579 100644
> >> --- a/MAINTAINERS
> >> +++ b/MAINTAINERS
> >> @@ -1574,28 +1574,6 @@ F: tcg/tci/
> >>  F: tci.c
> >>  F: disas/tci.c
> >>  
> >> -Stable branches
> >> ----------------
> >> -Stable 1.0
> >> -L: qemu-stable@nongnu.org
> >> -T: git git://git.qemu-project.org/qemu-stable-1.0.git
> >> -S: Orphan
> >> -
> >> -Stable 0.15
> >> -L: qemu-stable@nongnu.org
> >> -T: git git://git.qemu-project.org/qemu-stable-0.15.git
> >> -S: Orphan
> >> -
> >> -Stable 0.14
> >> -L: qemu-stable@nongnu.org
> >> -T: git git://git.qemu-project.org/qemu-stable-0.14.git
> >> -S: Orphan
> >> -
> >> -Stable 0.10
> >> -L: qemu-stable@nongnu.org
> >> -T: git git://git.qemu-project.org/qemu-stable-0.10.git
> >> -S: Orphan
> >> -
> >>  Block drivers
> >>  -------------
> >>  VMDK
> >> -- 
> >> 1.8.3.1
> >>
> 

Re: [Qemu-devel] [PULL 6/6] MAINTAINERS: Remove obsolete stable branches

[Michael Roth]

Quoting Michael Roth (2017-01-10 10:34:29)
> Quoting Thomas Huth (2017-01-10 01:54:40)
> > On 10.01.2017 04:32, Michael S. Tsirkin wrote:
> > > On Thu, Nov 10, 2016 at 11:11:43AM +0100, Thomas Huth wrote:
> > >> There are only very old and orphaned stable branches listed
> > >> in the MAINTAINERS file - so this section is pretty useless
> > >> nowadays. Let's remove it.
> > >>
> > >> Reviewed-by: John Snow <jsnow@redhat.com>
> > >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> > > 
> > > 
> > > Could you add some kind of entry for stable though?
> > > Otherwise people won't know which address to CC.
> > 
> > I think that's a question to Michael Roth - whether such an entry should
> > be added and how it should look like.
> 
> Hmm, not sure how to make this very readable. Something like this
> perhaps?
> 
> Stable branches
> ---------------
> Current M.(N-1) Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.9.0)

Heh, that's not even correct. Should be something like:

Current M.N Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.8.0)
M: Michael Roth <mdroth@linux.vnet.ibm.com>
L: qemu-stable@nongnu.org
T: git git://git.qemu-project.org/qemu.git stable-M.N
S: Supported

If that seems reasonable I'll send a proper patch.

> M: Michael Roth <mdroth@linux.vnet.ibm.com>
> L: qemu-stable@nongnu.org
> T: git git://git.qemu-project.org/qemu.git stable-M.(N-1)
> S: Supported
> 
> > 
> >  Thomas
> > 
> > 
> > >> ---
> > >>  MAINTAINERS | 22 ----------------------
> > >>  1 file changed, 22 deletions(-)
> > >>
> > >> diff --git a/MAINTAINERS b/MAINTAINERS
> > >> index d8575ab..4a60579 100644
> > >> --- a/MAINTAINERS
> > >> +++ b/MAINTAINERS
> > >> @@ -1574,28 +1574,6 @@ F: tcg/tci/
> > >>  F: tci.c
> > >>  F: disas/tci.c
> > >>  
> > >> -Stable branches
> > >> ----------------
> > >> -Stable 1.0
> > >> -L: qemu-stable@nongnu.org
> > >> -T: git git://git.qemu-project.org/qemu-stable-1.0.git
> > >> -S: Orphan
> > >> -
> > >> -Stable 0.15
> > >> -L: qemu-stable@nongnu.org
> > >> -T: git git://git.qemu-project.org/qemu-stable-0.15.git
> > >> -S: Orphan
> > >> -
> > >> -Stable 0.14
> > >> -L: qemu-stable@nongnu.org
> > >> -T: git git://git.qemu-project.org/qemu-stable-0.14.git
> > >> -S: Orphan
> > >> -
> > >> -Stable 0.10
> > >> -L: qemu-stable@nongnu.org
> > >> -T: git git://git.qemu-project.org/qemu-stable-0.10.git
> > >> -S: Orphan
> > >> -
> > >>  Block drivers
> > >>  -------------
> > >>  VMDK
> > >> -- 
> > >> 1.8.3.1
> > >>
> > 

Re: [Qemu-devel] [PULL 6/6] MAINTAINERS: Remove obsolete stable branches

[Paolo Bonzini]

On 10/01/2017 17:34, Michael Roth wrote:
> Quoting Thomas Huth (2017-01-10 01:54:40)
>> On 10.01.2017 04:32, Michael S. Tsirkin wrote:
>>> On Thu, Nov 10, 2016 at 11:11:43AM +0100, Thomas Huth wrote:
>>>> There are only very old and orphaned stable branches listed
>>>> in the MAINTAINERS file - so this section is pretty useless
>>>> nowadays. Let's remove it.
>>>>
>>>> Reviewed-by: John Snow <jsnow@redhat.com>
>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>
>>>
>>> Could you add some kind of entry for stable though?
>>> Otherwise people won't know which address to CC.
>>
>> I think that's a question to Michael Roth - whether such an entry should
>> be added and how it should look like.
> 
> Hmm, not sure how to make this very readable. Something like this
> perhaps?
> 
> Stable branches
> ---------------
> Current M.(N-1) Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.9.0)
> M: Michael Roth <mdroth@linux.vnet.ibm.com>
> L: qemu-stable@nongnu.org
> T: git git://git.qemu-project.org/qemu.git stable-M.(N-1)
> S: Supported

I would just say

Stable branches
---------------
Current Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.9.0)
M: Michael Roth <mdroth@linux.vnet.ibm.com>
L: qemu-stable@nongnu.org
S: Supported

Is the stable git tree used in practice, except in the days right before
a release?

Paolo

>>
>>  Thomas
>>
>>
>>>> ---
>>>>  MAINTAINERS | 22 ----------------------
>>>>  1 file changed, 22 deletions(-)
>>>>
>>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>>> index d8575ab..4a60579 100644
>>>> --- a/MAINTAINERS
>>>> +++ b/MAINTAINERS
>>>> @@ -1574,28 +1574,6 @@ F: tcg/tci/
>>>>  F: tci.c
>>>>  F: disas/tci.c
>>>>  
>>>> -Stable branches
>>>> ----------------
>>>> -Stable 1.0
>>>> -L: qemu-stable@nongnu.org
>>>> -T: git git://git.qemu-project.org/qemu-stable-1.0.git
>>>> -S: Orphan
>>>> -
>>>> -Stable 0.15
>>>> -L: qemu-stable@nongnu.org
>>>> -T: git git://git.qemu-project.org/qemu-stable-0.15.git
>>>> -S: Orphan
>>>> -
>>>> -Stable 0.14
>>>> -L: qemu-stable@nongnu.org
>>>> -T: git git://git.qemu-project.org/qemu-stable-0.14.git
>>>> -S: Orphan
>>>> -
>>>> -Stable 0.10
>>>> -L: qemu-stable@nongnu.org
>>>> -T: git git://git.qemu-project.org/qemu-stable-0.10.git
>>>> -S: Orphan
>>>> -
>>>>  Block drivers
>>>>  -------------
>>>>  VMDK
>>>> -- 
>>>> 1.8.3.1
>>>>
>>
> 
> 
> 

Re: [Qemu-devel] [PULL 6/6] MAINTAINERS: Remove obsolete stable branches

[Michael Roth]

Quoting Paolo Bonzini (2017-01-10 10:45:02)
> 
> 
> On 10/01/2017 17:34, Michael Roth wrote:
> > Quoting Thomas Huth (2017-01-10 01:54:40)
> >> On 10.01.2017 04:32, Michael S. Tsirkin wrote:
> >>> On Thu, Nov 10, 2016 at 11:11:43AM +0100, Thomas Huth wrote:
> >>>> There are only very old and orphaned stable branches listed
> >>>> in the MAINTAINERS file - so this section is pretty useless
> >>>> nowadays. Let's remove it.
> >>>>
> >>>> Reviewed-by: John Snow <jsnow@redhat.com>
> >>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
> >>>
> >>>
> >>> Could you add some kind of entry for stable though?
> >>> Otherwise people won't know which address to CC.
> >>
> >> I think that's a question to Michael Roth - whether such an entry should
> >> be added and how it should look like.
> > 
> > Hmm, not sure how to make this very readable. Something like this
> > perhaps?
> > 
> > Stable branches
> > ---------------
> > Current M.(N-1) Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.9.0)
> > M: Michael Roth <mdroth@linux.vnet.ibm.com>
> > L: qemu-stable@nongnu.org
> > T: git git://git.qemu-project.org/qemu.git stable-M.(N-1)
> > S: Supported
> 
> I would just say
> 
> Stable branches
> ---------------
> Current Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.9.0)
> M: Michael Roth <mdroth@linux.vnet.ibm.com>
> L: qemu-stable@nongnu.org
> S: Supported
> 
> Is the stable git tree used in practice, except in the days right before
> a release?

Generally not on my end, but it's possible downstreams make use of them
as a means to just grab the latest stable release (though I don't know if
this is actually the case or not). I agree that having it in MAINTAINERS
isprobably of limited usefulness though.

I *would* like to have a fairly consistent tree that's updated more regularly
that people could target for backports and such, but that would probably
be via my stable-N.M-staging tree on github. Perhaps I should point
people there instead? Unfortunately that still requires some amount of
variable substitution.

> 
> Paolo
> 
> >>
> >>  Thomas
> >>
> >>
> >>>> ---
> >>>>  MAINTAINERS | 22 ----------------------
> >>>>  1 file changed, 22 deletions(-)
> >>>>
> >>>> diff --git a/MAINTAINERS b/MAINTAINERS
> >>>> index d8575ab..4a60579 100644
> >>>> --- a/MAINTAINERS
> >>>> +++ b/MAINTAINERS
> >>>> @@ -1574,28 +1574,6 @@ F: tcg/tci/
> >>>>  F: tci.c
> >>>>  F: disas/tci.c
> >>>>  
> >>>> -Stable branches
> >>>> ----------------
> >>>> -Stable 1.0
> >>>> -L: qemu-stable@nongnu.org
> >>>> -T: git git://git.qemu-project.org/qemu-stable-1.0.git
> >>>> -S: Orphan
> >>>> -
> >>>> -Stable 0.15
> >>>> -L: qemu-stable@nongnu.org
> >>>> -T: git git://git.qemu-project.org/qemu-stable-0.15.git
> >>>> -S: Orphan
> >>>> -
> >>>> -Stable 0.14
> >>>> -L: qemu-stable@nongnu.org
> >>>> -T: git git://git.qemu-project.org/qemu-stable-0.14.git
> >>>> -S: Orphan
> >>>> -
> >>>> -Stable 0.10
> >>>> -L: qemu-stable@nongnu.org
> >>>> -T: git git://git.qemu-project.org/qemu-stable-0.10.git
> >>>> -S: Orphan
> >>>> -
> >>>>  Block drivers
> >>>>  -------------
> >>>>  VMDK
> >>>> -- 
> >>>> 1.8.3.1
> >>>>
> >>
> > 
> > 
> > 
> 

Re: [Qemu-devel] [PULL 6/6] MAINTAINERS: Remove obsolete stable branches

[Michael S. Tsirkin]

On Tue, Jan 10, 2017 at 11:27:58AM -0600, Michael Roth wrote:
> Quoting Paolo Bonzini (2017-01-10 10:45:02)
> > 
> > 
> > On 10/01/2017 17:34, Michael Roth wrote:
> > > Quoting Thomas Huth (2017-01-10 01:54:40)
> > >> On 10.01.2017 04:32, Michael S. Tsirkin wrote:
> > >>> On Thu, Nov 10, 2016 at 11:11:43AM +0100, Thomas Huth wrote:
> > >>>> There are only very old and orphaned stable branches listed
> > >>>> in the MAINTAINERS file - so this section is pretty useless
> > >>>> nowadays. Let's remove it.
> > >>>>
> > >>>> Reviewed-by: John Snow <jsnow@redhat.com>
> > >>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
> > >>>
> > >>>
> > >>> Could you add some kind of entry for stable though?
> > >>> Otherwise people won't know which address to CC.
> > >>
> > >> I think that's a question to Michael Roth - whether such an entry should
> > >> be added and how it should look like.
> > > 
> > > Hmm, not sure how to make this very readable. Something like this
> > > perhaps?
> > > 
> > > Stable branches
> > > ---------------
> > > Current M.(N-1) Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.9.0)
> > > M: Michael Roth <mdroth@linux.vnet.ibm.com>
> > > L: qemu-stable@nongnu.org
> > > T: git git://git.qemu-project.org/qemu.git stable-M.(N-1)
> > > S: Supported
> > 
> > I would just say
> > 
> > Stable branches
> > ---------------
> > Current Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.9.0)
> > M: Michael Roth <mdroth@linux.vnet.ibm.com>
> > L: qemu-stable@nongnu.org
> > S: Supported
> > 
> > Is the stable git tree used in practice, except in the days right before
> > a release?
> 
> Generally not on my end, but it's possible downstreams make use of them
> as a means to just grab the latest stable release (though I don't know if
> this is actually the case or not). I agree that having it in MAINTAINERS
> isprobably of limited usefulness though.
> 
> I *would* like to have a fairly consistent tree that's updated more regularly
> that people could target for backports and such, but that would probably
> be via my stable-N.M-staging tree on github. Perhaps I should point
> people there instead? Unfortunately that still requires some amount of
> variable substitution.

Do you need multiple trees? Why not have branches?

> > 
> > Paolo
> > 
> > >>
> > >>  Thomas
> > >>
> > >>
> > >>>> ---
> > >>>>  MAINTAINERS | 22 ----------------------
> > >>>>  1 file changed, 22 deletions(-)
> > >>>>
> > >>>> diff --git a/MAINTAINERS b/MAINTAINERS
> > >>>> index d8575ab..4a60579 100644
> > >>>> --- a/MAINTAINERS
> > >>>> +++ b/MAINTAINERS
> > >>>> @@ -1574,28 +1574,6 @@ F: tcg/tci/
> > >>>>  F: tci.c
> > >>>>  F: disas/tci.c
> > >>>>  
> > >>>> -Stable branches
> > >>>> ----------------
> > >>>> -Stable 1.0
> > >>>> -L: qemu-stable@nongnu.org
> > >>>> -T: git git://git.qemu-project.org/qemu-stable-1.0.git
> > >>>> -S: Orphan
> > >>>> -
> > >>>> -Stable 0.15
> > >>>> -L: qemu-stable@nongnu.org
> > >>>> -T: git git://git.qemu-project.org/qemu-stable-0.15.git
> > >>>> -S: Orphan
> > >>>> -
> > >>>> -Stable 0.14
> > >>>> -L: qemu-stable@nongnu.org
> > >>>> -T: git git://git.qemu-project.org/qemu-stable-0.14.git
> > >>>> -S: Orphan
> > >>>> -
> > >>>> -Stable 0.10
> > >>>> -L: qemu-stable@nongnu.org
> > >>>> -T: git git://git.qemu-project.org/qemu-stable-0.10.git
> > >>>> -S: Orphan
> > >>>> -
> > >>>>  Block drivers
> > >>>>  -------------
> > >>>>  VMDK
> > >>>> -- 
> > >>>> 1.8.3.1
> > >>>>
> > >>
> > > 
> > > 
> > > 
> > 

Re: [Qemu-devel] [PULL 6/6] MAINTAINERS: Remove obsolete stable branches

[Michael Roth]

Quoting Michael S. Tsirkin (2017-01-10 11:43:24)
> On Tue, Jan 10, 2017 at 11:27:58AM -0600, Michael Roth wrote:
> > Quoting Paolo Bonzini (2017-01-10 10:45:02)
> > > 
> > > 
> > > On 10/01/2017 17:34, Michael Roth wrote:
> > > > Quoting Thomas Huth (2017-01-10 01:54:40)
> > > >> On 10.01.2017 04:32, Michael S. Tsirkin wrote:
> > > >>> On Thu, Nov 10, 2016 at 11:11:43AM +0100, Thomas Huth wrote:
> > > >>>> There are only very old and orphaned stable branches listed
> > > >>>> in the MAINTAINERS file - so this section is pretty useless
> > > >>>> nowadays. Let's remove it.
> > > >>>>
> > > >>>> Reviewed-by: John Snow <jsnow@redhat.com>
> > > >>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
> > > >>>
> > > >>>
> > > >>> Could you add some kind of entry for stable though?
> > > >>> Otherwise people won't know which address to CC.
> > > >>
> > > >> I think that's a question to Michael Roth - whether such an entry should
> > > >> be added and how it should look like.
> > > > 
> > > > Hmm, not sure how to make this very readable. Something like this
> > > > perhaps?
> > > > 
> > > > Stable branches
> > > > ---------------
> > > > Current M.(N-1) Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.9.0)
> > > > M: Michael Roth <mdroth@linux.vnet.ibm.com>
> > > > L: qemu-stable@nongnu.org
> > > > T: git git://git.qemu-project.org/qemu.git stable-M.(N-1)
> > > > S: Supported
> > > 
> > > I would just say
> > > 
> > > Stable branches
> > > ---------------
> > > Current Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.9.0)
> > > M: Michael Roth <mdroth@linux.vnet.ibm.com>
> > > L: qemu-stable@nongnu.org
> > > S: Supported
> > > 
> > > Is the stable git tree used in practice, except in the days right before
> > > a release?
> > 
> > Generally not on my end, but it's possible downstreams make use of them
> > as a means to just grab the latest stable release (though I don't know if
> > this is actually the case or not). I agree that having it in MAINTAINERS
> > isprobably of limited usefulness though.
> > 
> > I *would* like to have a fairly consistent tree that's updated more regularly
> > that people could target for backports and such, but that would probably
> > be via my stable-N.M-staging tree on github. Perhaps I should point
> > people there instead? Unfortunately that still requires some amount of
> > variable substitution.
> 
> Do you need multiple trees? Why not have branches?

Sorry, by "tree" I meant branch, e.g.:

  https://github.com/mdroth/qemu/tree/stable-2.7-staging
  https://github.com/mdroth/qemu/tree/stable-2.6-staging

etc. Or were you suggesting something else?

I don't think I can do something like a single stable-current-staging
branch since there's often some overlap between stable releases for N
and N-1 cycles, and the N branches aren't direct descendants of N-1
(not sure if that's what you were suggesting).

> 
> > > 
> > > Paolo
> > > 
> > > >>
> > > >>  Thomas
> > > >>
> > > >>
> > > >>>> ---
> > > >>>>  MAINTAINERS | 22 ----------------------
> > > >>>>  1 file changed, 22 deletions(-)
> > > >>>>
> > > >>>> diff --git a/MAINTAINERS b/MAINTAINERS
> > > >>>> index d8575ab..4a60579 100644
> > > >>>> --- a/MAINTAINERS
> > > >>>> +++ b/MAINTAINERS
> > > >>>> @@ -1574,28 +1574,6 @@ F: tcg/tci/
> > > >>>>  F: tci.c
> > > >>>>  F: disas/tci.c
> > > >>>>  
> > > >>>> -Stable branches
> > > >>>> ----------------
> > > >>>> -Stable 1.0
> > > >>>> -L: qemu-stable@nongnu.org
> > > >>>> -T: git git://git.qemu-project.org/qemu-stable-1.0.git
> > > >>>> -S: Orphan
> > > >>>> -
> > > >>>> -Stable 0.15
> > > >>>> -L: qemu-stable@nongnu.org
> > > >>>> -T: git git://git.qemu-project.org/qemu-stable-0.15.git
> > > >>>> -S: Orphan
> > > >>>> -
> > > >>>> -Stable 0.14
> > > >>>> -L: qemu-stable@nongnu.org
> > > >>>> -T: git git://git.qemu-project.org/qemu-stable-0.14.git
> > > >>>> -S: Orphan
> > > >>>> -
> > > >>>> -Stable 0.10
> > > >>>> -L: qemu-stable@nongnu.org
> > > >>>> -T: git git://git.qemu-project.org/qemu-stable-0.10.git
> > > >>>> -S: Orphan
> > > >>>> -
> > > >>>>  Block drivers
> > > >>>>  -------------
> > > >>>>  VMDK
> > > >>>> -- 
> > > >>>> 1.8.3.1
> > > >>>>
> > > >>
> > > > 
> > > > 
> > > > 
> > > 
> 

Re: [Qemu-devel] [PULL 6/6] MAINTAINERS: Remove obsolete stable branches

[Michael S. Tsirkin]

On Tue, Jan 10, 2017 at 12:17:26PM -0600, Michael Roth wrote:
> Quoting Michael S. Tsirkin (2017-01-10 11:43:24)
> > On Tue, Jan 10, 2017 at 11:27:58AM -0600, Michael Roth wrote:
> > > Quoting Paolo Bonzini (2017-01-10 10:45:02)
> > > > 
> > > > 
> > > > On 10/01/2017 17:34, Michael Roth wrote:
> > > > > Quoting Thomas Huth (2017-01-10 01:54:40)
> > > > >> On 10.01.2017 04:32, Michael S. Tsirkin wrote:
> > > > >>> On Thu, Nov 10, 2016 at 11:11:43AM +0100, Thomas Huth wrote:
> > > > >>>> There are only very old and orphaned stable branches listed
> > > > >>>> in the MAINTAINERS file - so this section is pretty useless
> > > > >>>> nowadays. Let's remove it.
> > > > >>>>
> > > > >>>> Reviewed-by: John Snow <jsnow@redhat.com>
> > > > >>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
> > > > >>>
> > > > >>>
> > > > >>> Could you add some kind of entry for stable though?
> > > > >>> Otherwise people won't know which address to CC.
> > > > >>
> > > > >> I think that's a question to Michael Roth - whether such an entry should
> > > > >> be added and how it should look like.
> > > > > 
> > > > > Hmm, not sure how to make this very readable. Something like this
> > > > > perhaps?
> > > > > 
> > > > > Stable branches
> > > > > ---------------
> > > > > Current M.(N-1) Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.9.0)
> > > > > M: Michael Roth <mdroth@linux.vnet.ibm.com>
> > > > > L: qemu-stable@nongnu.org
> > > > > T: git git://git.qemu-project.org/qemu.git stable-M.(N-1)
> > > > > S: Supported
> > > > 
> > > > I would just say
> > > > 
> > > > Stable branches
> > > > ---------------
> > > > Current Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.9.0)
> > > > M: Michael Roth <mdroth@linux.vnet.ibm.com>
> > > > L: qemu-stable@nongnu.org
> > > > S: Supported
> > > > 
> > > > Is the stable git tree used in practice, except in the days right before
> > > > a release?
> > > 
> > > Generally not on my end, but it's possible downstreams make use of them
> > > as a means to just grab the latest stable release (though I don't know if
> > > this is actually the case or not). I agree that having it in MAINTAINERS
> > > isprobably of limited usefulness though.
> > > 
> > > I *would* like to have a fairly consistent tree that's updated more regularly
> > > that people could target for backports and such, but that would probably
> > > be via my stable-N.M-staging tree on github. Perhaps I should point
> > > people there instead? Unfortunately that still requires some amount of
> > > variable substitution.
> > 
> > Do you need multiple trees? Why not have branches?
> 
> Sorry, by "tree" I meant branch, e.g.:
> 
>   https://github.com/mdroth/qemu/tree/stable-2.7-staging
>   https://github.com/mdroth/qemu/tree/stable-2.6-staging

I would say

T: git git://git.qemu-project.org/qemu.git stable-M.(N-1)

conveys that clearly.


> etc. Or were you suggesting something else?
> 
> I don't think I can do something like a single stable-current-staging
> branch since there's often some overlap between stable releases for N
> and N-1 cycles, and the N branches aren't direct descendants of N-1
> (not sure if that's what you were suggesting).
> 
> > 
> > > > 
> > > > Paolo
> > > > 
> > > > >>
> > > > >>  Thomas
> > > > >>
> > > > >>
> > > > >>>> ---
> > > > >>>>  MAINTAINERS | 22 ----------------------
> > > > >>>>  1 file changed, 22 deletions(-)
> > > > >>>>
> > > > >>>> diff --git a/MAINTAINERS b/MAINTAINERS
> > > > >>>> index d8575ab..4a60579 100644
> > > > >>>> --- a/MAINTAINERS
> > > > >>>> +++ b/MAINTAINERS
> > > > >>>> @@ -1574,28 +1574,6 @@ F: tcg/tci/
> > > > >>>>  F: tci.c
> > > > >>>>  F: disas/tci.c
> > > > >>>>  
> > > > >>>> -Stable branches
> > > > >>>> ----------------
> > > > >>>> -Stable 1.0
> > > > >>>> -L: qemu-stable@nongnu.org
> > > > >>>> -T: git git://git.qemu-project.org/qemu-stable-1.0.git
> > > > >>>> -S: Orphan
> > > > >>>> -
> > > > >>>> -Stable 0.15
> > > > >>>> -L: qemu-stable@nongnu.org
> > > > >>>> -T: git git://git.qemu-project.org/qemu-stable-0.15.git
> > > > >>>> -S: Orphan
> > > > >>>> -
> > > > >>>> -Stable 0.14
> > > > >>>> -L: qemu-stable@nongnu.org
> > > > >>>> -T: git git://git.qemu-project.org/qemu-stable-0.14.git
> > > > >>>> -S: Orphan
> > > > >>>> -
> > > > >>>> -Stable 0.10
> > > > >>>> -L: qemu-stable@nongnu.org
> > > > >>>> -T: git git://git.qemu-project.org/qemu-stable-0.10.git
> > > > >>>> -S: Orphan
> > > > >>>> -
> > > > >>>>  Block drivers
> > > > >>>>  -------------
> > > > >>>>  VMDK
> > > > >>>> -- 
> > > > >>>> 1.8.3.1
> > > > >>>>
> > > > >>
> > > > > 
> > > > > 
> > > > > 
> > > > 
> > 

Re: [Qemu-devel] [PULL 6/6] MAINTAINERS: Remove obsolete stable branches

[Michael Roth]

Quoting Michael S. Tsirkin (2017-01-10 13:28:44)
> On Tue, Jan 10, 2017 at 12:17:26PM -0600, Michael Roth wrote:
> > Quoting Michael S. Tsirkin (2017-01-10 11:43:24)
> > > On Tue, Jan 10, 2017 at 11:27:58AM -0600, Michael Roth wrote:
> > > > Quoting Paolo Bonzini (2017-01-10 10:45:02)
> > > > > 
> > > > > 
> > > > > On 10/01/2017 17:34, Michael Roth wrote:
> > > > > > Quoting Thomas Huth (2017-01-10 01:54:40)
> > > > > >> On 10.01.2017 04:32, Michael S. Tsirkin wrote:
> > > > > >>> On Thu, Nov 10, 2016 at 11:11:43AM +0100, Thomas Huth wrote:
> > > > > >>>> There are only very old and orphaned stable branches listed
> > > > > >>>> in the MAINTAINERS file - so this section is pretty useless
> > > > > >>>> nowadays. Let's remove it.
> > > > > >>>>
> > > > > >>>> Reviewed-by: John Snow <jsnow@redhat.com>
> > > > > >>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
> > > > > >>>
> > > > > >>>
> > > > > >>> Could you add some kind of entry for stable though?
> > > > > >>> Otherwise people won't know which address to CC.
> > > > > >>
> > > > > >> I think that's a question to Michael Roth - whether such an entry should
> > > > > >> be added and how it should look like.
> > > > > > 
> > > > > > Hmm, not sure how to make this very readable. Something like this
> > > > > > perhaps?
> > > > > > 
> > > > > > Stable branches
> > > > > > ---------------
> > > > > > Current M.(N-1) Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.9.0)
> > > > > > M: Michael Roth <mdroth@linux.vnet.ibm.com>
> > > > > > L: qemu-stable@nongnu.org
> > > > > > T: git git://git.qemu-project.org/qemu.git stable-M.(N-1)
> > > > > > S: Supported
> > > > > 
> > > > > I would just say
> > > > > 
> > > > > Stable branches
> > > > > ---------------
> > > > > Current Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.9.0)
> > > > > M: Michael Roth <mdroth@linux.vnet.ibm.com>
> > > > > L: qemu-stable@nongnu.org
> > > > > S: Supported
> > > > > 
> > > > > Is the stable git tree used in practice, except in the days right before
> > > > > a release?
> > > > 
> > > > Generally not on my end, but it's possible downstreams make use of them
> > > > as a means to just grab the latest stable release (though I don't know if
> > > > this is actually the case or not). I agree that having it in MAINTAINERS
> > > > isprobably of limited usefulness though.
> > > > 
> > > > I *would* like to have a fairly consistent tree that's updated more regularly
> > > > that people could target for backports and such, but that would probably
> > > > be via my stable-N.M-staging tree on github. Perhaps I should point
> > > > people there instead? Unfortunately that still requires some amount of
> > > > variable substitution.
> > > 
> > > Do you need multiple trees? Why not have branches?
> > 
> > Sorry, by "tree" I meant branch, e.g.:
> > 
> >   https://github.com/mdroth/qemu/tree/stable-2.7-staging
> >   https://github.com/mdroth/qemu/tree/stable-2.6-staging
> 
> I would say
> 
> T: git git://git.qemu-project.org/qemu.git stable-M.(N-1)
> 
> conveys that clearly.

Agreed as far as the formatting, but thinking more on Paolo's query I'm not
sure the qemu.org branch is preferrable over my staging tree on github.

The main issue is that I generally only update the qemu.org branches as
part of the actual releases, whereas my staging tree is updated a bit
more regularly (and in that sense more akin to the various other
development trees referenced in MAINTAINERS).

I don't use the git.qemu.org stable branches for staging because I regularly
force-push prior to release to handle reverts/fixes to avoid diverting too
much from x.y.0 with various fix-up patches from my end, and exposing that
part of the process doesn't really sit well with me for an "official" stable
branch where I think there's some implied expectation of stability (for both
code and history). I also don't really like the idea of force-pushing anything
to git.qemu.org in general as it seems like somewhat of a liability.

Would it be appropriate to reference 2 trees?

T: git git://git.qemu-project.org/qemu.git stable-M.N (releases only)
T: git git://github.com/mdroth/qemu.git stable-M.N-staging

> 
> 
> > etc. Or were you suggesting something else?
> > 
> > I don't think I can do something like a single stable-current-staging
> > branch since there's often some overlap between stable releases for N
> > and N-1 cycles, and the N branches aren't direct descendants of N-1
> > (not sure if that's what you were suggesting).
> > 
> > > 
> > > > > 
> > > > > Paolo
> > > > > 
> > > > > >>
> > > > > >>  Thomas
> > > > > >>
> > > > > >>
> > > > > >>>> ---
> > > > > >>>>  MAINTAINERS | 22 ----------------------
> > > > > >>>>  1 file changed, 22 deletions(-)
> > > > > >>>>
> > > > > >>>> diff --git a/MAINTAINERS b/MAINTAINERS
> > > > > >>>> index d8575ab..4a60579 100644
> > > > > >>>> --- a/MAINTAINERS
> > > > > >>>> +++ b/MAINTAINERS
> > > > > >>>> @@ -1574,28 +1574,6 @@ F: tcg/tci/
> > > > > >>>>  F: tci.c
> > > > > >>>>  F: disas/tci.c
> > > > > >>>>  
> > > > > >>>> -Stable branches
> > > > > >>>> ----------------
> > > > > >>>> -Stable 1.0
> > > > > >>>> -L: qemu-stable@nongnu.org
> > > > > >>>> -T: git git://git.qemu-project.org/qemu-stable-1.0.git
> > > > > >>>> -S: Orphan
> > > > > >>>> -
> > > > > >>>> -Stable 0.15
> > > > > >>>> -L: qemu-stable@nongnu.org
> > > > > >>>> -T: git git://git.qemu-project.org/qemu-stable-0.15.git
> > > > > >>>> -S: Orphan
> > > > > >>>> -
> > > > > >>>> -Stable 0.14
> > > > > >>>> -L: qemu-stable@nongnu.org
> > > > > >>>> -T: git git://git.qemu-project.org/qemu-stable-0.14.git
> > > > > >>>> -S: Orphan
> > > > > >>>> -
> > > > > >>>> -Stable 0.10
> > > > > >>>> -L: qemu-stable@nongnu.org
> > > > > >>>> -T: git git://git.qemu-project.org/qemu-stable-0.10.git
> > > > > >>>> -S: Orphan
> > > > > >>>> -
> > > > > >>>>  Block drivers
> > > > > >>>>  -------------
> > > > > >>>>  VMDK
> > > > > >>>> -- 
> > > > > >>>> 1.8.3.1
> > > > > >>>>
> > > > > >>
> > > > > > 
> > > > > > 
> > > > > > 
> > > > > 
> > > 
> 

Re: [Qemu-devel] [PULL 6/6] MAINTAINERS: Remove obsolete stable branches

[Michael S. Tsirkin]

On Tue, Jan 10, 2017 at 02:18:45PM -0600, Michael Roth wrote:
> Quoting Michael S. Tsirkin (2017-01-10 13:28:44)
> > On Tue, Jan 10, 2017 at 12:17:26PM -0600, Michael Roth wrote:
> > > Quoting Michael S. Tsirkin (2017-01-10 11:43:24)
> > > > On Tue, Jan 10, 2017 at 11:27:58AM -0600, Michael Roth wrote:
> > > > > Quoting Paolo Bonzini (2017-01-10 10:45:02)
> > > > > > 
> > > > > > 
> > > > > > On 10/01/2017 17:34, Michael Roth wrote:
> > > > > > > Quoting Thomas Huth (2017-01-10 01:54:40)
> > > > > > >> On 10.01.2017 04:32, Michael S. Tsirkin wrote:
> > > > > > >>> On Thu, Nov 10, 2016 at 11:11:43AM +0100, Thomas Huth wrote:
> > > > > > >>>> There are only very old and orphaned stable branches listed
> > > > > > >>>> in the MAINTAINERS file - so this section is pretty useless
> > > > > > >>>> nowadays. Let's remove it.
> > > > > > >>>>
> > > > > > >>>> Reviewed-by: John Snow <jsnow@redhat.com>
> > > > > > >>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
> > > > > > >>>
> > > > > > >>>
> > > > > > >>> Could you add some kind of entry for stable though?
> > > > > > >>> Otherwise people won't know which address to CC.
> > > > > > >>
> > > > > > >> I think that's a question to Michael Roth - whether such an entry should
> > > > > > >> be added and how it should look like.
> > > > > > > 
> > > > > > > Hmm, not sure how to make this very readable. Something like this
> > > > > > > perhaps?
> > > > > > > 
> > > > > > > Stable branches
> > > > > > > ---------------
> > > > > > > Current M.(N-1) Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.9.0)
> > > > > > > M: Michael Roth <mdroth@linux.vnet.ibm.com>
> > > > > > > L: qemu-stable@nongnu.org
> > > > > > > T: git git://git.qemu-project.org/qemu.git stable-M.(N-1)
> > > > > > > S: Supported
> > > > > > 
> > > > > > I would just say
> > > > > > 
> > > > > > Stable branches
> > > > > > ---------------
> > > > > > Current Stable Branch (e.g. v2.8 if latest M.N.0 release was v2.9.0)
> > > > > > M: Michael Roth <mdroth@linux.vnet.ibm.com>
> > > > > > L: qemu-stable@nongnu.org
> > > > > > S: Supported
> > > > > > 
> > > > > > Is the stable git tree used in practice, except in the days right before
> > > > > > a release?
> > > > > 
> > > > > Generally not on my end, but it's possible downstreams make use of them
> > > > > as a means to just grab the latest stable release (though I don't know if
> > > > > this is actually the case or not). I agree that having it in MAINTAINERS
> > > > > isprobably of limited usefulness though.
> > > > > 
> > > > > I *would* like to have a fairly consistent tree that's updated more regularly
> > > > > that people could target for backports and such, but that would probably
> > > > > be via my stable-N.M-staging tree on github. Perhaps I should point
> > > > > people there instead? Unfortunately that still requires some amount of
> > > > > variable substitution.
> > > > 
> > > > Do you need multiple trees? Why not have branches?
> > > 
> > > Sorry, by "tree" I meant branch, e.g.:
> > > 
> > >   https://github.com/mdroth/qemu/tree/stable-2.7-staging
> > >   https://github.com/mdroth/qemu/tree/stable-2.6-staging
> > 
> > I would say
> > 
> > T: git git://git.qemu-project.org/qemu.git stable-M.(N-1)
> > 
> > conveys that clearly.
> 
> Agreed as far as the formatting, but thinking more on Paolo's query I'm not
> sure the qemu.org branch is preferrable over my staging tree on github.
> 
> The main issue is that I generally only update the qemu.org branches as
> part of the actual releases, whereas my staging tree is updated a bit
> more regularly (and in that sense more akin to the various other
> development trees referenced in MAINTAINERS).
> 
> I don't use the git.qemu.org stable branches for staging because I regularly
> force-push prior to release to handle reverts/fixes to avoid diverting too
> much from x.y.0 with various fix-up patches from my end, and exposing that
> part of the process doesn't really sit well with me for an "official" stable
> branch where I think there's some implied expectation of stability (for both
> code and history). I also don't really like the idea of force-pushing anything
> to git.qemu.org in general as it seems like somewhat of a liability.
> 
> Would it be appropriate to reference 2 trees?
> 
> T: git git://git.qemu-project.org/qemu.git stable-M.N (releases only)
> T: git git://github.com/mdroth/qemu.git stable-M.N-staging

I don't think it matters, just reference what's the most
updated one.

> > 
> > 
> > > etc. Or were you suggesting something else?
> > > 
> > > I don't think I can do something like a single stable-current-staging
> > > branch since there's often some overlap between stable releases for N
> > > and N-1 cycles, and the N branches aren't direct descendants of N-1
> > > (not sure if that's what you were suggesting).
> > > 
> > > > 
> > > > > > 
> > > > > > Paolo
> > > > > > 
> > > > > > >>
> > > > > > >>  Thomas
> > > > > > >>
> > > > > > >>
> > > > > > >>>> ---
> > > > > > >>>>  MAINTAINERS | 22 ----------------------
> > > > > > >>>>  1 file changed, 22 deletions(-)
> > > > > > >>>>
> > > > > > >>>> diff --git a/MAINTAINERS b/MAINTAINERS
> > > > > > >>>> index d8575ab..4a60579 100644
> > > > > > >>>> --- a/MAINTAINERS
> > > > > > >>>> +++ b/MAINTAINERS
> > > > > > >>>> @@ -1574,28 +1574,6 @@ F: tcg/tci/
> > > > > > >>>>  F: tci.c
> > > > > > >>>>  F: disas/tci.c
> > > > > > >>>>  
> > > > > > >>>> -Stable branches
> > > > > > >>>> ----------------
> > > > > > >>>> -Stable 1.0
> > > > > > >>>> -L: qemu-stable@nongnu.org
> > > > > > >>>> -T: git git://git.qemu-project.org/qemu-stable-1.0.git
> > > > > > >>>> -S: Orphan
> > > > > > >>>> -
> > > > > > >>>> -Stable 0.15
> > > > > > >>>> -L: qemu-stable@nongnu.org
> > > > > > >>>> -T: git git://git.qemu-project.org/qemu-stable-0.15.git
> > > > > > >>>> -S: Orphan
> > > > > > >>>> -
> > > > > > >>>> -Stable 0.14
> > > > > > >>>> -L: qemu-stable@nongnu.org
> > > > > > >>>> -T: git git://git.qemu-project.org/qemu-stable-0.14.git
> > > > > > >>>> -S: Orphan
> > > > > > >>>> -
> > > > > > >>>> -Stable 0.10
> > > > > > >>>> -L: qemu-stable@nongnu.org
> > > > > > >>>> -T: git git://git.qemu-project.org/qemu-stable-0.10.git
> > > > > > >>>> -S: Orphan
> > > > > > >>>> -
> > > > > > >>>>  Block drivers
> > > > > > >>>>  -------------
> > > > > > >>>>  VMDK
> > > > > > >>>> -- 
> > > > > > >>>> 1.8.3.1
> > > > > > >>>>
> > > > > > >>
> > > > > > > 
> > > > > > > 
> > > > > > > 
> > > > > > 
> > > > 
> > 

Re: [Qemu-devel] [PULL 0/6] Fixes for the MAINTAINERS file

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 1427 bytes --]

On Thu, Nov 10, 2016 at 11:11:37AM +0100, Thomas Huth wrote:
> The following changes since commit 9b4b0350264d8164996265d635c8b9599673afb4:
> 
>   Merge remote-tracking branch 'public/tags/tracing-pull-request' into staging (2016-11-09 12:44:16 +0000)
> 
> are available in the git repository at:
> 
> 
>   https://github.com/huth/qemu.git tags/maintainers-20161110
> 
> for you to fetch changes up to 275196e9a2b13e3e24fd6cf638c02a6454071b8a:
> 
>   MAINTAINERS: Remove obsolete stable branches (2016-11-10 10:27:19 +0100)
> 
> ----------------------------------------------------------------
> Fixes for the MAINTAINERS file for QEMU 2.8
> 
> ----------------------------------------------------------------
> John Snow (1):
>       MAINTAINERS: Add Fam and Jsnow for Bitmap support
> 
> Thomas Huth (5):
>       MAINTAINERS: Add some ARM related files to the corresponding sections
>       sparc: Add slavio_misc.c and eccmemctl.c to the MAINTAINERS file
>       m68k: Update the 68k sections in the MAINTAINERS file
>       MAINTAINERS: Add an entry for the CHRP NVRAM files
>       MAINTAINERS: Remove obsolete stable branches
> 
>  MAINTAINERS | 59 +++++++++++++++++++++++++++++++++++------------------------
>  1 file changed, 35 insertions(+), 24 deletions(-)
> 
> -- 
> 1.8.3.1
> 
> 

Thanks, applied to my staging tree:
https://github.com/stefanha/qemu/commits/staging

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]