From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 1 Jan 2021 12:54:19 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/marcel/tags/rdma-pull-request' into staging
X-Git-Tag: v6.0.0-rc0~168
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50536341b47f1e6478c42d4b4a1337b72762721b;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/marcel/tags/rdma-pull-request' into staging

RDMA queue

*  bug fix in contrib/rdmacm-mux

# gpg: Signature made Fri 18 Dec 2020 18:40:53 GMT
# gpg:                using RSA key 36D4C0F0CF2FE46D
# gpg: Good signature from "Marcel Apfelbaum <marcel.apfelbaum@zoho.com>" [marginal]
# gpg:                 aka "Marcel Apfelbaum <marcel@redhat.com>" [marginal]
# gpg:                 aka "Marcel Apfelbaum <marcel.apfelbaum@gmail.com>" [marginal]
# 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:
  contrib/rdmacm-mux: Fix error condition in hash_tbl_search_fd_by_ifid()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

50536341b47f1e6478c42d4b4a1337b72762721b