diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-11-01 14:38:50 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-11-01 14:38:50 +0000 |
| commit | 9fc22e42cc9035db0279e8e890cafe03aa457286 (patch) | |
| tree | f55f4307a149c303663fc35b65f4af94a77ffeab /MAINTAINERS | |
| parent | 8ebf8ea90ecbbb2ef743dccfbfb73e2904cad1f5 (diff) | |
| parent | f5177798d899a2ee2a2d0babd3f5399d0f786333 (diff) | |
Merge remote-tracking branch 'remotes/berrange/tags/misc-next-pull-request' into staging
Merge misc fixes
# gpg: Signature made Wed 31 Oct 2018 11:36:12 GMT
# gpg: using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/misc-next-pull-request:
scripts: report on author emails that are mangled by the mailing list
block: drop moderated sheepdog mailing list from MAINTAINERS file
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4bb6d23aa5..f2360efe3e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2028,7 +2028,6 @@ Sheepdog M: Liu Yuan <namei.unix@gmail.com> M: Jeff Cody <jcody@redhat.com> L: qemu-block@nongnu.org -L: sheepdog@lists.wpkg.org S: Supported F: block/sheepdog.c T: git git://github.com/codyprime/qemu-kvm-jtc.git block |