diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-01 13:11:30 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-01 13:11:30 +0100 |
commit | c25e8bba1f546ea72744ccfab77f8a9e8a323be8 (patch) | |
tree | 82f742cd079629bf6451341a3f377cd93be3d2f5 /slirp/socket.c | |
parent | 14fc618461c2756a3f0b16bf6af198c5d7731137 (diff) | |
parent | 9d0fdecbad130f01b602e35e87c6d3fad5821d6e (diff) |
Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20180601' into staging
pull-seccomp-20180601
# gpg: Signature made Fri 01 Jun 2018 13:01:18 BST
# gpg: using RSA key DF32E7C0F0FFF9A2
# gpg: Good signature from "Eduardo Otubo (Senior Software Engineer) <otubo@redhat.com>"
# Primary key fingerprint: D67E 1B50 9374 86B4 0723 DBAB DF32 E7C0 F0FF F9A2
* remotes/otubo/tags/pull-seccomp-20180601:
sandbox: disable -sandbox if CONFIG_SECCOMP undefined
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'slirp/socket.c')
0 files changed, 0 insertions, 0 deletions