diff options
| author | Peter Maydell | 2020-10-30 16:49:35 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-10-30 16:49:35 +0100 |
| commit | 9a2ea4f4a7230fe224dee91d9adf2ef872c3d226 (patch) | |
| tree | 37f70ac1318a1b355a07b3e53faf46b7304b5f46 /include/sysemu | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | CHANGELOG: remove disused file (diff) | |
| download | qemu-9a2ea4f4a7230fe224dee91d9adf2ef872c3d226.tar.gz qemu-9a2ea4f4a7230fe224dee91d9adf2ef872c3d226.tar.xz qemu-9a2ea4f4a7230fe224dee91d9adf2ef872c3d226.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging
Pull request trivial branch 20201027
# gpg: Signature made Tue 27 Oct 2020 16:29:47 GMT
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-for-5.2-pull-request:
CHANGELOG: remove disused file
qdev: Fix two typos
scripts/qmp: delete 'qmp' script
cryptodev: Fix Lesser GPL version number
io: Fix Lesser GPL version number
cpus: Drop declaration of cpu_remove()
Makefile: Add *.[ch].inc files to cscope/ctags/TAGS
elf2dmp: Fix memory leak on main() error paths
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/sysemu')
| -rw-r--r-- | include/sysemu/cryptodev-vhost-user.h | 2 | ||||
| -rw-r--r-- | include/sysemu/cryptodev-vhost.h | 2 | ||||
| -rw-r--r-- | include/sysemu/cryptodev.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/sysemu/cryptodev-vhost-user.h b/include/sysemu/cryptodev-vhost-user.h index 0d3421e7e8..60710502c2 100644 --- a/include/sysemu/cryptodev-vhost-user.h +++ b/include/sysemu/cryptodev-vhost-user.h @@ -9,7 +9,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/include/sysemu/cryptodev-vhost.h b/include/sysemu/cryptodev-vhost.h index f42824fbde..e8cab1356e 100644 --- a/include/sysemu/cryptodev-vhost.h +++ b/include/sysemu/cryptodev-vhost.h @@ -10,7 +10,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/include/sysemu/cryptodev.h b/include/sysemu/cryptodev.h index b458aa4dae..f4d4057d4d 100644 --- a/include/sysemu/cryptodev.h +++ b/include/sysemu/cryptodev.h @@ -9,7 +9,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of |