[PATCH 2/6] MAINTAINERS: fix paths for relocated files

Sean Wei posted 6 patches 5 months ago
Maintainers: "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, Gustavo Romero <gustavo.romero@linaro.org>, Keith Busch <kbusch@kernel.org>, Klaus Jensen <its@irrelevant.dk>, Jesper Devantier <foss@defmacro.it>, Nicholas Piggin <npiggin@gmail.com>, Daniel Henrique Barboza <danielhb413@gmail.com>, Harsh Prateek Bora <harshpb@linux.ibm.com>, Peter Maydell <peter.maydell@linaro.org>, Song Gao <gaosong@loongson.cn>, Fabiano Rosas <farosas@suse.de>, Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>
[PATCH 2/6] MAINTAINERS: fix paths for relocated files
Posted by Sean Wei 5 months ago
Several files were renamed in previous commits, causing their entries
in MAINTAINERS to reference outdated paths.
This prevents scripts/get_maintainer.pl from correctly matching
these files to their maintainers.

Update the filenames to reflect their current locations so that
maintainer lookup works properly.

Related commits
---------------

  c45460decbd (Oct 2023)
    hw/input/stellaris_input: Rename to stellaris_gamepad
    Rename  include/hw/input/{gamepad.h => stellaris_gamepad.h}

  4faf359accb (Nov 2020)
    docs: Move virtio-net-failover.rst into the system manual
    Rename  docs/{ => system}/virtio-net-failover.rst

  89857312f32 (Apr 2024)
    hw/usb: move stubs out of stubs/
    Rename  stubs/usb-dev-stub.c => hw/usb/bus-stub.c

  f2604d8508a (Apr 2024)
    hw/virtio: move stubs out of stubs/
    Rename  stubs/virtio-md-pci.c => hw/virtio/virtio-md-stubs.c

  2c888febdfa (Apr 2024)
    memory-device: move stubs out of stubs/
    Rename  stubs/memory_device.c => hw/mem/memory-device-stubs.c

  d481cec7565 (Oct 2024)
    migration: Move cpu-throttle.c from system to migration
    Rename  {system => migration}/cpu-throttle.c

  864a3fa4392 (Jan 2023)
    monitor: Rename misc.c to hmp-target.c
    Rename  monitor/{misc.c => hmp-target.c}

Signed-off-by: Sean Wei <me@sean.taipei>
---
 MAINTAINERS | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index fed8619874..0477e124d1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1002,7 +1002,7 @@ L: qemu-arm@nongnu.org
 S: Odd Fixes
 F: hw/*/stellaris*
 F: hw/display/ssd03*
-F: include/hw/input/gamepad.h
+F: include/hw/input/stellaris_gamepad.h
 F: include/hw/timer/stellaris-gptm.h
 F: docs/system/arm/stellaris.rst
 F: tests/functional/test_arm_stellaris.py
@@ -2163,7 +2163,7 @@ F: hw/net/
 F: include/hw/net/
 F: tests/qtest/virtio-net-test.c
 F: tests/functional/test_info_usernet.py
-F: docs/virtio-net-failover.rst
+F: docs/system/virtio-net-failover.rst
 T: git https://github.com/jasowang/qemu.git net
 
 Parallel NOR Flash devices
@@ -2214,7 +2214,7 @@ F: tests/qtest/sdhci-test.c
 USB
 S: Orphan
 F: hw/usb/*
-F: stubs/usb-dev-stub.c
+F: hw/usb/bus-stub.c
 F: tests/qtest/usb-*-test.c
 F: docs/system/devices/usb.rst
 F: include/hw/usb.h
@@ -2469,7 +2469,7 @@ F: hw/s390x/virtio-ccw-md.h
 F: hw/s390x/virtio-ccw-md-stubs.c
 F: hw/virtio/virtio-md-pci.c
 F: include/hw/virtio/virtio-md-pci.h
-F: stubs/virtio-md-pci.c
+F: hw/virtio/virtio-md-stubs.c
 
 virtio-mem
 M: David Hildenbrand <david@redhat.com>
@@ -3187,7 +3187,7 @@ F: hw/mem/pc-dimm.c
 F: include/hw/mem/memory-device.h
 F: include/hw/mem/nvdimm.h
 F: include/hw/mem/pc-dimm.h
-F: stubs/memory_device.c
+F: hw/mem/memory-device-stubs.c
 F: docs/nvdimm.txt
 
 SPICE
@@ -3228,9 +3228,9 @@ F: util/qemu-timer*.c
 F: system/vl.c
 F: system/main.c
 F: system/cpus.c
-F: system/cpu-throttle.c
 F: system/cpu-timers.c
 F: system/runstate*
+F: migration/cpu-throttle.c
 F: qapi/run-state.json
 
 Read, Copy, Update (RCU)
@@ -3249,7 +3249,7 @@ Human Monitor (HMP)
 M: Dr. David Alan Gilbert <dave@treblig.org>
 S: Maintained
 F: monitor/monitor-internal.h
-F: monitor/misc.c
+F: monitor/hmp-target.c
 F: monitor/monitor.c
 F: monitor/hmp*
 F: hmp.h
-- 
2.49.0
Re: [PATCH 2/6] MAINTAINERS: fix paths for relocated files
Posted by Thomas Huth 4 months, 2 weeks ago
On 16/06/2025 17.48, Sean Wei wrote:
> Several files were renamed in previous commits, causing their entries
> in MAINTAINERS to reference outdated paths.
> This prevents scripts/get_maintainer.pl from correctly matching
> these files to their maintainers.
> 
> Update the filenames to reflect their current locations so that
> maintainer lookup works properly.
> 
> Related commits
> ---------------
> 
>    c45460decbd (Oct 2023)
>      hw/input/stellaris_input: Rename to stellaris_gamepad
>      Rename  include/hw/input/{gamepad.h => stellaris_gamepad.h}
> 
>    4faf359accb (Nov 2020)
>      docs: Move virtio-net-failover.rst into the system manual
>      Rename  docs/{ => system}/virtio-net-failover.rst
> 
>    89857312f32 (Apr 2024)
>      hw/usb: move stubs out of stubs/
>      Rename  stubs/usb-dev-stub.c => hw/usb/bus-stub.c
> 
>    f2604d8508a (Apr 2024)
>      hw/virtio: move stubs out of stubs/
>      Rename  stubs/virtio-md-pci.c => hw/virtio/virtio-md-stubs.c
> 
>    2c888febdfa (Apr 2024)
>      memory-device: move stubs out of stubs/
>      Rename  stubs/memory_device.c => hw/mem/memory-device-stubs.c
> 
>    d481cec7565 (Oct 2024)
>      migration: Move cpu-throttle.c from system to migration
>      Rename  {system => migration}/cpu-throttle.c
> 
>    864a3fa4392 (Jan 2023)
>      monitor: Rename misc.c to hmp-target.c
>      Rename  monitor/{misc.c => hmp-target.c}
> 
> Signed-off-by: Sean Wei <me@sean.taipei>
> ---
>   MAINTAINERS | 14 +++++++-------
>   1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index fed8619874..0477e124d1 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1002,7 +1002,7 @@ L: qemu-arm@nongnu.org
>   S: Odd Fixes
>   F: hw/*/stellaris*
>   F: hw/display/ssd03*
> -F: include/hw/input/gamepad.h
> +F: include/hw/input/stellaris_gamepad.h
>   F: include/hw/timer/stellaris-gptm.h
>   F: docs/system/arm/stellaris.rst
>   F: tests/functional/test_arm_stellaris.py
> @@ -2163,7 +2163,7 @@ F: hw/net/
>   F: include/hw/net/
>   F: tests/qtest/virtio-net-test.c
>   F: tests/functional/test_info_usernet.py
> -F: docs/virtio-net-failover.rst
> +F: docs/system/virtio-net-failover.rst
>   T: git https://github.com/jasowang/qemu.git net
>   
>   Parallel NOR Flash devices
> @@ -2214,7 +2214,7 @@ F: tests/qtest/sdhci-test.c
>   USB
>   S: Orphan
>   F: hw/usb/*
> -F: stubs/usb-dev-stub.c
> +F: hw/usb/bus-stub.c

I think we could simply drop this line now completely since it is already 
covered by the previous hw/usb/* wildcard line.

>   F: tests/qtest/usb-*-test.c
>   F: docs/system/devices/usb.rst
>   F: include/hw/usb.h
> @@ -2469,7 +2469,7 @@ F: hw/s390x/virtio-ccw-md.h
>   F: hw/s390x/virtio-ccw-md-stubs.c
>   F: hw/virtio/virtio-md-pci.c
>   F: include/hw/virtio/virtio-md-pci.h
> -F: stubs/virtio-md-pci.c
> +F: hw/virtio/virtio-md-stubs.c

Could be merged with the hw/virtio/virtio-md-pci.c line by turning it into:

F: hw/virtio/virtio-md-*.c

>   virtio-mem
>   M: David Hildenbrand <david@redhat.com>
> @@ -3187,7 +3187,7 @@ F: hw/mem/pc-dimm.c
>   F: include/hw/mem/memory-device.h
>   F: include/hw/mem/nvdimm.h
>   F: include/hw/mem/pc-dimm.h
> -F: stubs/memory_device.c
> +F: hw/mem/memory-device-stubs.c

This could be merged with the preceeding "hw/mem/memory-device.c" line, too, 
by turning it into:

F: hw/mem/memory-device*.c

  Thomas
Re: [PATCH 2/6] MAINTAINERS: fix paths for relocated files
Posted by Sean Wei 4 months, 2 weeks ago
On 2025/7/1 1:24 PM, Thomas Huth wrote:
> On 16/06/2025 17.48, Sean Wei wrote:
>> Several files were renamed in previous commits, causing their entries
>> in MAINTAINERS to reference outdated paths.
>> This prevents scripts/get_maintainer.pl from correctly matching
>> these files to their maintainers.
>>
>> Update the filenames to reflect their current locations so that
>> maintainer lookup works properly.
>>
>> Related commits
>> ---------------
>>
>>    c45460decbd (Oct 2023)
>>      hw/input/stellaris_input: Rename to stellaris_gamepad
>>      Rename  include/hw/input/{gamepad.h => stellaris_gamepad.h}
>>
>>    4faf359accb (Nov 2020)
>>      docs: Move virtio-net-failover.rst into the system manual
>>      Rename  docs/{ => system}/virtio-net-failover.rst
>>
>>    89857312f32 (Apr 2024)
>>      hw/usb: move stubs out of stubs/
>>      Rename  stubs/usb-dev-stub.c => hw/usb/bus-stub.c
>>
>>    f2604d8508a (Apr 2024)
>>      hw/virtio: move stubs out of stubs/
>>      Rename  stubs/virtio-md-pci.c => hw/virtio/virtio-md-stubs.c
>>
>>    2c888febdfa (Apr 2024)
>>      memory-device: move stubs out of stubs/
>>      Rename  stubs/memory_device.c => hw/mem/memory-device-stubs.c
>>
>>    d481cec7565 (Oct 2024)
>>      migration: Move cpu-throttle.c from system to migration
>>      Rename  {system => migration}/cpu-throttle.c
>>
>>    864a3fa4392 (Jan 2023)
>>      monitor: Rename misc.c to hmp-target.c
>>      Rename  monitor/{misc.c => hmp-target.c}
>>
>> Signed-off-by: Sean Wei <me@sean.taipei>
>> ---
>>   MAINTAINERS | 14 +++++++-------
>>   1 file changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index fed8619874..0477e124d1 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -1002,7 +1002,7 @@ L: qemu-arm@nongnu.org
>>   S: Odd Fixes
>>   F: hw/*/stellaris*
>>   F: hw/display/ssd03*
>> -F: include/hw/input/gamepad.h
>> +F: include/hw/input/stellaris_gamepad.h
>>   F: include/hw/timer/stellaris-gptm.h
>>   F: docs/system/arm/stellaris.rst
>>   F: tests/functional/test_arm_stellaris.py
>> @@ -2163,7 +2163,7 @@ F: hw/net/
>>   F: include/hw/net/
>>   F: tests/qtest/virtio-net-test.c
>>   F: tests/functional/test_info_usernet.py
>> -F: docs/virtio-net-failover.rst
>> +F: docs/system/virtio-net-failover.rst
>>   T: git https://github.com/jasowang/qemu.git net
>>   Parallel NOR Flash devices
>> @@ -2214,7 +2214,7 @@ F: tests/qtest/sdhci-test.c
>>   USB
>>   S: Orphan
>>   F: hw/usb/*
>> -F: stubs/usb-dev-stub.c
>> +F: hw/usb/bus-stub.c
> 
> I think we could simply drop this line now completely since it is 
> already covered by the previous hw/usb/* wildcard line.
> 
>>   F: tests/qtest/usb-*-test.c
>>   F: docs/system/devices/usb.rst
>>   F: include/hw/usb.h
>> @@ -2469,7 +2469,7 @@ F: hw/s390x/virtio-ccw-md.h
>>   F: hw/s390x/virtio-ccw-md-stubs.c
>>   F: hw/virtio/virtio-md-pci.c
>>   F: include/hw/virtio/virtio-md-pci.h
>> -F: stubs/virtio-md-pci.c
>> +F: hw/virtio/virtio-md-stubs.c
> 
> Could be merged with the hw/virtio/virtio-md-pci.c line by turning it into:
> 
> F: hw/virtio/virtio-md-*.c
> 
>>   virtio-mem
>>   M: David Hildenbrand <david@redhat.com>
>> @@ -3187,7 +3187,7 @@ F: hw/mem/pc-dimm.c
>>   F: include/hw/mem/memory-device.h
>>   F: include/hw/mem/nvdimm.h
>>   F: include/hw/mem/pc-dimm.h
>> -F: stubs/memory_device.c
>> +F: hw/mem/memory-device-stubs.c
> 
> This could be merged with the preceeding "hw/mem/memory-device.c" line, 
> too, by turning it into:
> 
> F: hw/mem/memory-device*.c
> 
>   Thomas
> 


Hi Thomas,

Oh yeah, those suggestions makes sense to me, and make this patch much 
better!

Should I send a PATCH v2 to the mailing list, or just attach the fix-up 
like this is enough?
I've also reviewed other files and no other improvement found.

Best wishes,
Sean Wei

---

Several files were renamed in previous commits, causing their entries
in MAINTAINERS to reference outdated paths.
This prevents scripts/get_maintainer.pl from correctly matching
these files to their maintainers.

Update the filenames to reflect their current locations so that
maintainer lookup works properly.

Related commits
---------------

   c45460decbd (Oct 2023)
     hw/input/stellaris_input: Rename to stellaris_gamepad
     Rename  include/hw/input/{gamepad.h => stellaris_gamepad.h}

   4faf359accb (Nov 2020)
     docs: Move virtio-net-failover.rst into the system manual
     Rename  docs/{ => system}/virtio-net-failover.rst

   89857312f32 (Apr 2024)
     hw/usb: move stubs out of stubs/
     Rename  stubs/usb-dev-stub.c => hw/usb/bus-stub.c

   f2604d8508a (Apr 2024)
     hw/virtio: move stubs out of stubs/
     Rename  stubs/virtio-md-pci.c => hw/virtio/virtio-md-stubs.c

   2c888febdfa (Apr 2024)
     memory-device: move stubs out of stubs/
     Rename  stubs/memory_device.c => hw/mem/memory-device-stubs.c

   d481cec7565 (Oct 2024)
     migration: Move cpu-throttle.c from system to migration
     Rename  {system => migration}/cpu-throttle.c

   864a3fa4392 (Jan 2023)
     monitor: Rename misc.c to hmp-target.c
     Rename  monitor/{misc.c => hmp-target.c}

Signed-off-by: Sean Wei <me@sean.taipei>
---
  MAINTAINERS | 15 ++++++---------
  1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index b7f321597f..d855cb1491 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1005,7 +1005,7 @@ L: qemu-arm@nongnu.org
  S: Odd Fixes
  F: hw/*/stellaris*
  F: hw/display/ssd03*
-F: include/hw/input/gamepad.h
+F: include/hw/input/stellaris_gamepad.h
  F: include/hw/timer/stellaris-gptm.h
  F: docs/system/arm/stellaris.rst
  F: tests/functional/test_arm_stellaris.py
@@ -2171,7 +2171,7 @@ F: hw/net/
  F: include/hw/net/
  F: tests/qtest/virtio-net-test.c
  F: tests/functional/test_info_usernet.py
-F: docs/virtio-net-failover.rst
+F: docs/system/virtio-net-failover.rst
  T: git https://github.com/jasowang/qemu.git net

  Parallel NOR Flash devices
@@ -2222,7 +2222,6 @@ F: tests/qtest/sdhci-test.c
  USB
  S: Orphan
  F: hw/usb/*
-F: stubs/usb-dev-stub.c
  F: tests/qtest/usb-*-test.c
  F: docs/system/devices/usb.rst
  F: include/hw/usb.h
@@ -2475,9 +2474,8 @@ S: Supported
  F: hw/s390x/virtio-ccw-md.c
  F: hw/s390x/virtio-ccw-md.h
  F: hw/s390x/virtio-ccw-md-stubs.c
-F: hw/virtio/virtio-md-pci.c
+F: hw/virtio/virtio-md-*.c
  F: include/hw/virtio/virtio-md-pci.h
-F: stubs/virtio-md-pci.c

  virtio-mem
  M: David Hildenbrand <david@redhat.com>
@@ -3195,13 +3193,12 @@ M: David Hildenbrand <david@redhat.com>
  M: Igor Mammedov <imammedo@redhat.com>
  R: Xiao Guangrong <xiaoguangrong.eric@gmail.com>
  S: Supported
-F: hw/mem/memory-device.c
+F: hw/mem/memory-device*.c
  F: hw/mem/nvdimm.c
  F: hw/mem/pc-dimm.c
  F: include/hw/mem/memory-device.h
  F: include/hw/mem/nvdimm.h
  F: include/hw/mem/pc-dimm.h
-F: stubs/memory_device.c
  F: docs/nvdimm.txt

  SPICE
@@ -3242,9 +3239,9 @@ F: util/qemu-timer*.c
  F: system/vl.c
  F: system/main.c
  F: system/cpus.c
-F: system/cpu-throttle.c
  F: system/cpu-timers.c
  F: system/runstate*
+F: migration/cpu-throttle.c
  F: qapi/run-state.json

  Read, Copy, Update (RCU)
@@ -3263,7 +3260,7 @@ Human Monitor (HMP)
  M: Dr. David Alan Gilbert <dave@treblig.org>
  S: Maintained
  F: monitor/monitor-internal.h
-F: monitor/misc.c
+F: monitor/hmp-target.c
  F: monitor/monitor.c
  F: monitor/hmp*
  F: hmp.h
-- 
2.50.0


Re: [PATCH 2/6] MAINTAINERS: fix paths for relocated files
Posted by Thomas Huth 4 months, 2 weeks ago
On 01/07/2025 20.06, Sean Wei wrote:
> On 2025/7/1 1:24 PM, Thomas Huth wrote:
>> On 16/06/2025 17.48, Sean Wei wrote:
>>> Several files were renamed in previous commits, causing their entries
>>> in MAINTAINERS to reference outdated paths.
>>> This prevents scripts/get_maintainer.pl from correctly matching
>>> these files to their maintainers.
>>>
>>> Update the filenames to reflect their current locations so that
>>> maintainer lookup works properly.
>>>
>>> Related commits
>>> ---------------
>>>
>>>    c45460decbd (Oct 2023)
>>>      hw/input/stellaris_input: Rename to stellaris_gamepad
>>>      Rename  include/hw/input/{gamepad.h => stellaris_gamepad.h}
>>>
>>>    4faf359accb (Nov 2020)
>>>      docs: Move virtio-net-failover.rst into the system manual
>>>      Rename  docs/{ => system}/virtio-net-failover.rst
>>>
>>>    89857312f32 (Apr 2024)
>>>      hw/usb: move stubs out of stubs/
>>>      Rename  stubs/usb-dev-stub.c => hw/usb/bus-stub.c
>>>
>>>    f2604d8508a (Apr 2024)
>>>      hw/virtio: move stubs out of stubs/
>>>      Rename  stubs/virtio-md-pci.c => hw/virtio/virtio-md-stubs.c
>>>
>>>    2c888febdfa (Apr 2024)
>>>      memory-device: move stubs out of stubs/
>>>      Rename  stubs/memory_device.c => hw/mem/memory-device-stubs.c
>>>
>>>    d481cec7565 (Oct 2024)
>>>      migration: Move cpu-throttle.c from system to migration
>>>      Rename  {system => migration}/cpu-throttle.c
>>>
>>>    864a3fa4392 (Jan 2023)
>>>      monitor: Rename misc.c to hmp-target.c
>>>      Rename  monitor/{misc.c => hmp-target.c}
>>>
>>> Signed-off-by: Sean Wei <me@sean.taipei>
>>> ---
>>>   MAINTAINERS | 14 +++++++-------
>>>   1 file changed, 7 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>> index fed8619874..0477e124d1 100644
>>> --- a/MAINTAINERS
>>> +++ b/MAINTAINERS
>>> @@ -1002,7 +1002,7 @@ L: qemu-arm@nongnu.org
>>>   S: Odd Fixes
>>>   F: hw/*/stellaris*
>>>   F: hw/display/ssd03*
>>> -F: include/hw/input/gamepad.h
>>> +F: include/hw/input/stellaris_gamepad.h
>>>   F: include/hw/timer/stellaris-gptm.h
>>>   F: docs/system/arm/stellaris.rst
>>>   F: tests/functional/test_arm_stellaris.py
>>> @@ -2163,7 +2163,7 @@ F: hw/net/
>>>   F: include/hw/net/
>>>   F: tests/qtest/virtio-net-test.c
>>>   F: tests/functional/test_info_usernet.py
>>> -F: docs/virtio-net-failover.rst
>>> +F: docs/system/virtio-net-failover.rst
>>>   T: git https://github.com/jasowang/qemu.git net
>>>   Parallel NOR Flash devices
>>> @@ -2214,7 +2214,7 @@ F: tests/qtest/sdhci-test.c
>>>   USB
>>>   S: Orphan
>>>   F: hw/usb/*
>>> -F: stubs/usb-dev-stub.c
>>> +F: hw/usb/bus-stub.c
>>
>> I think we could simply drop this line now completely since it is already 
>> covered by the previous hw/usb/* wildcard line.
>>
>>>   F: tests/qtest/usb-*-test.c
>>>   F: docs/system/devices/usb.rst
>>>   F: include/hw/usb.h
>>> @@ -2469,7 +2469,7 @@ F: hw/s390x/virtio-ccw-md.h
>>>   F: hw/s390x/virtio-ccw-md-stubs.c
>>>   F: hw/virtio/virtio-md-pci.c
>>>   F: include/hw/virtio/virtio-md-pci.h
>>> -F: stubs/virtio-md-pci.c
>>> +F: hw/virtio/virtio-md-stubs.c
>>
>> Could be merged with the hw/virtio/virtio-md-pci.c line by turning it into:
>>
>> F: hw/virtio/virtio-md-*.c
>>
>>>   virtio-mem
>>>   M: David Hildenbrand <david@redhat.com>
>>> @@ -3187,7 +3187,7 @@ F: hw/mem/pc-dimm.c
>>>   F: include/hw/mem/memory-device.h
>>>   F: include/hw/mem/nvdimm.h
>>>   F: include/hw/mem/pc-dimm.h
>>> -F: stubs/memory_device.c
>>> +F: hw/mem/memory-device-stubs.c
>>
>> This could be merged with the preceeding "hw/mem/memory-device.c" line, 
>> too, by turning it into:
>>
>> F: hw/mem/memory-device*.c
>>
>>   Thomas
>>
> 
> 
> Hi Thomas,
> 
> Oh yeah, those suggestions makes sense to me, and make this patch much better!
> 
> Should I send a PATCH v2 to the mailing list, or just attach the fix-up like 
> this is enough?

Normally I'd recommend a proper v2, but this time I was also able to apply 
your inlined updated patch, so no need to resend.

Thanks, I'll queue your patches for my next pull request.

  Thomas