From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 4 Mar 2021 10:42:46 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20210304... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cb90ecf9349198558569f6c86c4c27d215406095;p=qemu.git

Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20210304' into staging

virtiofs minor security fix

Fix xattrmap to drop remapped security.capability capabilities.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

# gpg: Signature made Thu 04 Mar 2021 10:36:45 GMT
# gpg:                using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert-gitlab/tags/pull-virtiofs-20210304:
  virtiofs: drop remapped security.capability xattr as needed

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

cb90ecf9349198558569f6c86c4c27d215406095