From: Peter Maydell Date: Tue, 13 Apr 2021 21:12:27 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20210413... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3ddb05dbf21e9dc9b37e3d1cd7ae3d694565e998;p=qemu.git Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20210413' into staging virtiofs: Fix feature negotiation (for 6.0) A 6.0 fix for feature negotiation on vhost-user. Signed-off-by: Dr. David Alan Gilbert # gpg: Signature made Tue 13 Apr 2021 16:21:41 BST # gpg: using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7 # gpg: Good signature from "Dr. David Alan Gilbert (RH2) " [full] # Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7 * remotes/dgilbert-gitlab/tags/pull-virtiofs-20210413: vhost-user-fs: fix features handling Signed-off-by: Peter Maydell --- 3ddb05dbf21e9dc9b37e3d1cd7ae3d694565e998