diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2018-08-20 15:44:40 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2018-08-20 15:44:41 +0100 |
commit | c8090972fa85b197411b530ddf81a2867379406c (patch) | |
tree | e69e51b0b544fe9486ec6811f024944a9300f327 /linux-user/x86_64/termbits.h | |
parent | 62c34848efb41f0e81af0c6b4f1d5d577039eec9 (diff) | |
parent | 21ab34c9543fe1b6d31b3edbd01a397e7e090d00 (diff) | |
download | qemu-c8090972fa85b197411b530ddf81a2867379406c.zip qemu-c8090972fa85b197411b530ddf81a2867379406c.tar.gz qemu-c8090972fa85b197411b530ddf81a2867379406c.tar.bz2 |
Merge remote-tracking branch 'remotes/marcel/tags/rdma-pull-request' into staging
RDMA queue
# gpg: Signature made Sat 18 Aug 2018 16:01:46 BST
# gpg: using RSA key 36D4C0F0CF2FE46D
# gpg: Good signature from "Marcel Apfelbaum <marcel.apfelbaum@zoho.com>"
# gpg: aka "Marcel Apfelbaum <marcel@redhat.com>"
# gpg: aka "Marcel Apfelbaum <marcel.apfelbaum@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: B1C6 3A57 F92E 08F2 640F 31F5 36D4 C0F0 CF2F E46D
* remotes/marcel/tags/rdma-pull-request:
config: split PVRDMA from RDMA
hw/pvrdma: remove not needed include
hw/rdma: Add reference to pci_dev in backend_dev
hw/rdma: Bugfix - Support non-aligned buffers
hw/rdma: Print backend QP number in hex format
hw/rdma: Cosmetic change - move to generic function
hw/pvrdma: Cosmetic change - indent right
hw/rdma: Reorder resource cleanup
hw/rdma: Do not allocate memory for non-dma MR
hw/rdma: Delete useless structure RdmaRmUserMR
hw/pvrdma: Make default pkey 0xFFFF
hw/pvrdma: Clean CQE before use
hw/rdma: Modify debug macros
hw/pvrdma: Bugfix - provide the correct attr_mask to query_qp
hw/rdma: Make distinction between device init and start modes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/x86_64/termbits.h')
0 files changed, 0 insertions, 0 deletions