diff options
| author | Peter Maydell | 2018-07-04 23:38:10 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-07-04 23:38:10 +0200 |
| commit | fe8d2d5737ab20ed0118863f5eb888cae37122ab (patch) | |
| tree | d81f2f9b693e45dda9704b984a6e815b71a19e78 /qemu-img.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/audio-20180703-pull-request... (diff) | |
| parent | linux-user/strace: Improve recvmsg() output (diff) | |
| download | qemu-fe8d2d5737ab20ed0118863f5eb888cae37122ab.tar.gz qemu-fe8d2d5737ab20ed0118863f5eb888cae37122ab.tar.xz qemu-fe8d2d5737ab20ed0118863f5eb888cae37122ab.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.0-pull-request' into staging
Some strace cleanups
Minor fixes for setsockopt() and netlink
Manage 'F' flag with qemu-binfmt-conf.sh
# gpg: Signature made Tue 03 Jul 2018 17:34:20 BST
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg: aka "Laurent Vivier <laurent@vivier.eu>"
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/linux-user-for-3.0-pull-request:
linux-user/strace: Improve recvmsg() output
linux-user/strace: Improve capget()/capset() output
linux-user: update do_setsockopt()
linux-user: add netlink CARRIER_UP_COUNT/CARRIER_DOWN_COUNT
qemu-binfmt-conf.sh: allow to provide a suffix to the interpreter name
qemu-binfmt-conf.sh: add persistent (F) flags
qemu-binfmt-conf.sh: cleanup --credential
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-img.c')
0 files changed, 0 insertions, 0 deletions