The following changes since commit 6af9d12c88b9720f209912f6e4b01fefe5906d59:

  Merge tag 'migration-20240331-pull-request' of https://gitlab.com/peterx/qemu into staging (2024-04-01 13:12:40 +0100)

are available in the Git repository at:

  https://gitlab.com/mjt0k/qemu.git tags/pull-trivial-patches

for you to fetch changes up to dd5b28de4ed04e0c750022f31b529e4fea7ab478:

  hmp: Add help information for watchdog action: inject-nmi (2024-04-01 19:52:14 +0300)

----------------------------------------------------------------
trivial patches for 2024-04-02

spelling fixes for the release, minor doc fixes and usb-audio fix.

----------------------------------------------------------------
Dayu Liu (1):
      hmp: Add help information for watchdog action: inject-nmi

Joonas Kankaala (1):
      usb-audio: Fix invalid values in AudioControl descriptors

Philippe Mathieu-Daudé (1):
      fpu/softfloat: Remove mention of TILE-Gx target

Stefan Weil (1):
      Fix some typos in documentation (found by codespell)

 docs/devel/atomics.rst         | 2 +-
 docs/devel/ci-jobs.rst.inc     | 2 +-
 docs/devel/clocks.rst          | 2 +-
 docs/system/i386/sgx.rst       | 2 +-
 fpu/softfloat-specialize.c.inc | 2 +-
 hmp-commands.hx                | 2 +-
 hw/usb/dev-audio.c             | 4 +---
 qapi/qom.json                  | 2 +-
 8 files changed, 8 insertions(+), 10 deletions(-)

On Tue, 2 Apr 2024 at 10:33, Michael Tokarev <mjt@tls.msk.ru> wrote:
>
> The following changes since commit 6af9d12c88b9720f209912f6e4b01fefe5906d59:
>
>   Merge tag 'migration-20240331-pull-request' of https://gitlab.com/peterx/qemu into staging (2024-04-01 13:12:40 +0100)
>
> are available in the Git repository at:
>
>   https://gitlab.com/mjt0k/qemu.git tags/pull-trivial-patches
>
> for you to fetch changes up to dd5b28de4ed04e0c750022f31b529e4fea7ab478:
>
>   hmp: Add help information for watchdog action: inject-nmi (2024-04-01 19:52:14 +0300)
>
> ----------------------------------------------------------------
> trivial patches for 2024-04-02
>
> spelling fixes for the release, minor doc fixes and usb-audio fix.
>
> ----------------------------------------------------------------
> Dayu Liu (1):
>       hmp: Add help information for watchdog action: inject-nmi
>
> Joonas Kankaala (1):
>       usb-audio: Fix invalid values in AudioControl descriptors
>
> Philippe Mathieu-Daudé (1):
>       fpu/softfloat: Remove mention of TILE-Gx target
>
> Stefan Weil (1):
>       Fix some typos in documentation (found by codespell)

Hi -- could you fix the Author line for this patch not to have
the mailing list address, please?

commit 33fc0dcc8aa1bc7800074e28243b5ba339b277a9
Author: Stefan Weil via <qemu-trivial@nongnu.org>
Date:   Sun Mar 31 18:15:26 2024 +0200

    Fix some typos in documentation (found by codespell)

(you'll need to tell git log "--no-mailmap" to not get confused
by the mapping we have for the last time one of these slipped
through...)

thanks
-- PMM

> Author: Stefan Weil via <qemu-trivial@nongnu.org>

*SIGH*  This happened *again*.

> (you'll need to tell git log "--no-mailmap" to not get confused
> by the mapping we have for the last time one of these slipped
> through...)

Now this is interesting.  And this is exactly why I haven't noticed
it - I did pay attention to Author lines this time.  -- because
it is displayed with mailmap applied.  How very useful.

I have to use `git show --no-mailmap' to see the original " via.."
version.

Resent.

Thanks,

/mjt

Le 02/04/2024 à 12:41, Michael Tokarev a écrit :
> 
>> Author: Stefan Weil via <qemu-trivial@nongnu.org>
> 
> *SIGH*  This happened *again*.
> 
>> (you'll need to tell git log "--no-mailmap" to not get confused
>> by the mapping we have for the last time one of these slipped
>> through...)
> 
> Now this is interesting.  And this is exactly why I haven't noticed
> it - I did pay attention to Author lines this time.  -- because
> it is displayed with mailmap applied.  How very useful.
> 
> I have to use `git show --no-mailmap' to see the original " via.."
> version.
>

To post PR I generally use git-publish and I have a hook that checks that.

$ cat .git/hooks/pre-publish-send-email
!/bin/bash

NAME=$(git config --get user.name)
EMAIL=$(git config --get user.email)

for PATCH in $1/*.patch; do
     if [ $(basename $PATCH) = "0000-cover-letter.patch" ]; then
         continue
     fi
     if ! grep -q "^Signed-off-by: $NAME <$EMAIL>" $PATCH; then
         echo "Error: Missing sender S-o-B in $PATCH"
         exit 1
     fi
     if grep "^From: " $PATCH | grep -q "<qemu-devel@nongnu.org>" ; then
         echo "Error: Author email address is mangled by the mailing list in $PATCH"
         exit 1
     fi
done
exit 0

On Tue, 2 Apr 2024 at 15:30, Laurent Vivier <laurent@vivier.eu> wrote:
> To post PR I generally use git-publish and I have a hook that checks that.
>
> $ cat .git/hooks/pre-publish-send-email
> !/bin/bash
>
> NAME=$(git config --get user.name)
> EMAIL=$(git config --get user.email)
>
> for PATCH in $1/*.patch; do
>      if [ $(basename $PATCH) = "0000-cover-letter.patch" ]; then
>          continue
>      fi
>      if ! grep -q "^Signed-off-by: $NAME <$EMAIL>" $PATCH; then
>          echo "Error: Missing sender S-o-B in $PATCH"
>          exit 1
>      fi
>      if grep "^From: " $PATCH | grep -q "<qemu-devel@nongnu.org>" ; then
>          echo "Error: Author email address is mangled by the mailing list in $PATCH"
>          exit 1
>      fi

You should check for qemu-.*, not just qemu-devel...

thanks
-- PMM

On Tue, 2 Apr 2024 at 11:41, Michael Tokarev <mjt@tls.msk.ru> wrote:
>
>
> > Author: Stefan Weil via <qemu-trivial@nongnu.org>
>
> *SIGH*  This happened *again*.
>
> > (you'll need to tell git log "--no-mailmap" to not get confused
> > by the mapping we have for the last time one of these slipped
> > through...)
>
> Now this is interesting.  And this is exactly why I haven't noticed
> it - I did pay attention to Author lines this time.  -- because
> it is displayed with mailmap applied.  How very useful.
>
> I have to use `git show --no-mailmap' to see the original " via.."
> version.

FWIW my apply-pullreq script makes this check for this:

if git shortlog --author='qemu-.*@nongnu\.org' master..staging | grep .; then
    echo "ERROR: pull request includes commits attributed to list"
    exit 1
fi

(This doesn't pass --no-mailmap, because git shortlog doesn't
take that option, and the --author match is done on the "true"
author, not the mapped one. This is the kind of orthogonality
in command line UI that we have come to expect from git ;-))

-- PMM