The following changes since commit ca4b5ef371d6602b73bc5eec08e3199b05caf146:

  Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-migration-20210726a' into staging (2021-07-27 10:55:50 +0100)

are available in the Git repository at:

  git://repo.or.cz/qemu/armbru.git tags/pull-misc-2021-07-27

for you to fetch changes up to 3e61a13af3d3a1942a1ec2f6dfd7b407a43e4273:

  vl: Don't continue after -smp help. (2021-07-27 16:52:37 +0200)

----------------------------------------------------------------
Miscellaneous patches for 2021-07-27

----------------------------------------------------------------
Markus Armbruster (1):
      vl: Don't continue after -smp help.

 softmmu/vl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.31.1

On Tue, 27 Jul 2021 at 16:22, Markus Armbruster <armbru@redhat.com> wrote:
>
> The following changes since commit ca4b5ef371d6602b73bc5eec08e3199b05caf146:
>
>   Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-migration-20210726a' into staging (2021-07-27 10:55:50 +0100)
>
> are available in the Git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-misc-2021-07-27
>
> for you to fetch changes up to 3e61a13af3d3a1942a1ec2f6dfd7b407a43e4273:
>
>   vl: Don't continue after -smp help. (2021-07-27 16:52:37 +0200)
>
> ----------------------------------------------------------------
> Miscellaneous patches for 2021-07-27
>
> ----------------------------------------------------------------
> Markus Armbruster (1):
>       vl: Don't continue after -smp help.
>
>  softmmu/vl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Just a note to say this has missed rc1 but is still on my list and
I'll apply it for rc2.

thanks
-- PMM

On Tue, 27 Jul 2021 at 16:22, Markus Armbruster <armbru@redhat.com> wrote:
>
> The following changes since commit ca4b5ef371d6602b73bc5eec08e3199b05caf146:
>
>   Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-migration-20210726a' into staging (2021-07-27 10:55:50 +0100)
>
> are available in the Git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-misc-2021-07-27
>
> for you to fetch changes up to 3e61a13af3d3a1942a1ec2f6dfd7b407a43e4273:
>
>   vl: Don't continue after -smp help. (2021-07-27 16:52:37 +0200)
>
> ----------------------------------------------------------------
> Miscellaneous patches for 2021-07-27
>
> ----------------------------------------------------------------
> Markus Armbruster (1):
>       vl: Don't continue after -smp help.
>
>  softmmu/vl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.1
for any user-visible changes.

-- PMM