[PATCH] mailmap: Fix Stefan Weil author email again

[PATCH] mailmap: Fix Stefan Weil author email again

[Philippe Mathieu-Daudé]

Commit 5204b499a6 ("mailmap: Fix Stefan Weil author email")
corrected authorship for patch received at qemu-devel@nongnu.org,
correct now for patch received at qemu-trivial@nongnu.org.

Fixes: d819fc9516 ("virtio-blk: Fix potential nullptr read access")
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index e12e19f691..ecdb063c35 100644
--- a/.mailmap
+++ b/.mailmap
@@ -60,6 +60,7 @@ Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu
 Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org>
 Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org>
 Stefan Weil <sw@weilnetz.de> Stefan Weil via <qemu-devel@nongnu.org>
+Stefan Weil <sw@weilnetz.de> Stefan Weil via <qemu-trivial@nongnu.org>
 Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> Andrey Drobyshev via <qemu-block@nongnu.org>
 BALATON Zoltan <balaton@eik.bme.hu> BALATON Zoltan via <qemu-ppc@nongnu.org>
 
-- 
2.41.0

Re: [PATCH] mailmap: Fix Stefan Weil author email again

[Michael Tokarev]

27.12.2023 11:59, Philippe Mathieu-Daudé:
> Commit 5204b499a6 ("mailmap: Fix Stefan Weil author email")
> corrected authorship for patch received at qemu-devel@nongnu.org,
> correct now for patch received at qemu-trivial@nongnu.org.
> 
> Fixes: d819fc9516 ("virtio-blk: Fix potential nullptr read access")

Do you think a single commit warrants an entry in mailmap?

/mjt

Re: [PATCH] mailmap: Fix Stefan Weil author email again

[Philippe Mathieu-Daudé]

On 27/12/23 10:09, Michael Tokarev wrote:
> 27.12.2023 11:59, Philippe Mathieu-Daudé:
>> Commit 5204b499a6 ("mailmap: Fix Stefan Weil author email")
>> corrected authorship for patch received at qemu-devel@nongnu.org,
>> correct now for patch received at qemu-trivial@nongnu.org.
>>
>> Fixes: d819fc9516 ("virtio-blk: Fix potential nullptr read access")
> 
> Do you think a single commit warrants an entry in mailmap?

If I cared enough to write and post a patch, I suppose so...

In the past the only limitation was whether someone was willing
to do the work and send a patch, not the size of the .mailmap
file.

Re: [PATCH] mailmap: Fix Stefan Weil author email again

[Philippe Mathieu-Daudé]

On 27/12/23 10:12, Philippe Mathieu-Daudé wrote:
> On 27/12/23 10:09, Michael Tokarev wrote:
>> 27.12.2023 11:59, Philippe Mathieu-Daudé:
>>> Commit 5204b499a6 ("mailmap: Fix Stefan Weil author email")
>>> corrected authorship for patch received at qemu-devel@nongnu.org,
>>> correct now for patch received at qemu-trivial@nongnu.org.
>>>
>>> Fixes: d819fc9516 ("virtio-blk: Fix potential nullptr read access")
>>
>> Do you think a single commit warrants an entry in mailmap?
> 
> If I cared enough to write and post a patch, I suppose so...
> 
> In the past the only limitation was whether someone was willing
> to do the work and send a patch, not the size of the .mailmap
> file.

A more useful use of our time would be a git pre-merge hook on
our CI, but that won't work because PR aren't merged on the CI
but externally, and the final commit is pushed.

The only place I can think of to automate that is to have a
script on the maintainer side. Remembering Peter had a such
script, I found a reference in the list:
https://git.linaro.org/people/pmaydell/misc-scripts.git/commit/?id=f9a317392e8

Stefan, do you mind using Peter's script for your merges?

Thanks,

Phil.

Re: [PATCH] mailmap: Fix Stefan Weil author email again

[Michael Tokarev]

27.12.2023 12:21, Philippe Mathieu-Daudé wrote:
..
> A more useful use of our time would be a git pre-merge hook on
> our CI, but that won't work because PR aren't merged on the CI
> but externally, and the final commit is pushed.
> 
> The only place I can think of to automate that is to have a
> script on the maintainer side. Remembering Peter had a such
> script, I found a reference in the list:
> https://git.linaro.org/people/pmaydell/misc-scripts.git/commit/?id=f9a317392e8
> 
> Stefan, do you mind using Peter's script for your merges?

Similar script (to check for things like that which are
absolutely unacceptable) can be used as a commit hook on
gitlab repo for staging branch.

/mjt

Re: [PATCH] mailmap: Fix Stefan Weil author email again

[Stefan Hajnoczi]

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

On Wed, Dec 27, 2023 at 10:21:26AM +0100, Philippe Mathieu-Daudé wrote:
> On 27/12/23 10:12, Philippe Mathieu-Daudé wrote:
> > On 27/12/23 10:09, Michael Tokarev wrote:
> > > 27.12.2023 11:59, Philippe Mathieu-Daudé:
> > > > Commit 5204b499a6 ("mailmap: Fix Stefan Weil author email")
> > > > corrected authorship for patch received at qemu-devel@nongnu.org,
> > > > correct now for patch received at qemu-trivial@nongnu.org.
> > > > 
> > > > Fixes: d819fc9516 ("virtio-blk: Fix potential nullptr read access")
> > > 
> > > Do you think a single commit warrants an entry in mailmap?
> > 
> > If I cared enough to write and post a patch, I suppose so...
> > 
> > In the past the only limitation was whether someone was willing
> > to do the work and send a patch, not the size of the .mailmap
> > file.
> 
> A more useful use of our time would be a git pre-merge hook on
> our CI, but that won't work because PR aren't merged on the CI
> but externally, and the final commit is pushed.
> 
> The only place I can think of to automate that is to have a
> script on the maintainer side. Remembering Peter had a such
> script, I found a reference in the list:
> https://git.linaro.org/people/pmaydell/misc-scripts.git/commit/?id=f9a317392e8
> 
> Stefan, do you mind using Peter's script for your merges?

Yes, in future releases. Peter is handling the QEMU 9.0 release so I
will not be merging pull requests for the time being.

Thanks,
Stefan

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

Re: [PATCH] mailmap: Fix Stefan Weil author email again

[Stefan Weil via]

Am 27.12.23 um 10:12 schrieb Philippe Mathieu-Daudé:

> On 27/12/23 10:09, Michael Tokarev wrote:
>> 27.12.2023 11:59, Philippe Mathieu-Daudé:
>>> Commit 5204b499a6 ("mailmap: Fix Stefan Weil author email")
>>> corrected authorship for patch received at qemu-devel@nongnu.org,
>>> correct now for patch received at qemu-trivial@nongnu.org.
>>>
>>> Fixes: d819fc9516 ("virtio-blk: Fix potential nullptr read access")
>>
>> Do you think a single commit warrants an entry in mailmap?
>
> If I cared enough to write and post a patch, I suppose so...
>
> In the past the only limitation was whether someone was willing
> to do the work and send a patch, not the size of the .mailmap
> file.

Thank you Philippe and Michael.

It looks like I have some more identities. :-)

    1 Author: Stefan Weil <stefan@kiwi.(none)>
    1 Author: Stefan Weil <stefan@weilnetz.de>
  697 Author: Stefan Weil <sw@weilnetz.de>
  361 Author: Stefan Weil <weil@mail.berlios.de>
    1 Author: Stefan Weil via <qemu-trivial@nongnu.org>

My very old address weil@mail.berlios.de might be more interesting for 
mailmap.

Regards,

Stefan