diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-29 16:56:45 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-29 16:56:45 +0100 |
| commit | b2866c29156afdcad3ced4cc2001bbfe4302d81c (patch) | |
| tree | f941c8d34578b475f0ec219a7642ab99510c8dc5 /hw/block/nvme.c | |
| parent | 75507f1aba6feb73ae43329922d51571550b9128 (diff) | |
| parent | 230f1b31c5d58a852e1ac46e1ef05cfa7d5d9280 (diff) | |
Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging
The Darwin host support still needs some more work. It won't make it for
soft-freeze, but I'd like these preparatory patches to be merged anyway.
# gpg: Signature made Fri 29 Jun 2018 11:39:04 BST
# gpg: using RSA key 71D4D5E5822F73D6
# gpg: Good signature from "Greg Kurz <groug@kaod.org>"
# gpg: aka "Gregory Kurz <gregory.kurz@free.fr>"
# gpg: aka "[jpeg image of size 3330]"
# Primary key fingerprint: B482 8BAF 9431 40CE F2A3 4910 71D4 D5E5 822F 73D6
* remotes/gkurz/tags/for-upstream:
9p: darwin: Explicitly cast comparisons of mode_t with -1
cutils: Provide strchrnul
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/block/nvme.c')
0 files changed, 0 insertions, 0 deletions