diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-11-06 09:10:46 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-11-06 09:10:46 +0000 |
| commit | 03c1ca1c51783603d42eb0f91d35961f0f4b4947 (patch) | |
| tree | d81c25db775758f3e4bfa9eb139c38678d4d5987 /util | |
| parent | 3cb99f4124faeca3235bd76ba2879ad091b43a50 (diff) | |
| parent | 8e4eb4279fce9a736131b94b6f5f09f0503e4ab3 (diff) | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20181105' into staging
- some changes in s390x maintainership
- bugfix in vfio-ap
# gpg: Signature made Mon 05 Nov 2018 16:34:03 GMT
# gpg: using RSA key DECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg: aka "Cornelia Huck <cohuck@kernel.org>"
# gpg: aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20181105:
MAINTAINERS: s390/boot: the ipl code and the bios belong together
MAINTAINERS: s390: Remove myself
MAINTAINERS: s390/pci: add Collin Walling as maintainer for zpci
MAINTAINERS: s390/virtio-ccw: drop Christian, add Halil
MAINTAINERS: s390: more maintainers for vfio-ccw
s390x/vfio-ap: report correct error
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
0 files changed, 0 insertions, 0 deletions