diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-12-13 13:06:09 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-12-13 13:06:09 +0000 |
| commit | 6145a6d84b3bf0f25935b88543febe076c61b0f4 (patch) | |
| tree | 144409e1b987f54a8abe9ea02dc0e9c2fb2ff879 /MAINTAINERS | |
| parent | b39c027d824847dc606e49f79304cb572ed6a9b3 (diff) | |
| parent | c9aacaadeb42076c01b07e59dd94dcf73f751e05 (diff) | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20181212' into staging
s390x patches for 4.0:
- add 4.0 machine type
- various fixes and small changes
# gpg: Signature made Wed 12 Dec 2018 09:52:04 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-20181212:
hw/s390x/virtio-ccw.c: Don't take address of fields in packed structs
vfio-ap: flag as compatible with balloon
s390x/tod: Properly stop the KVM TOD while the guest is not running
s390/MAINTAINERS: Add Halil as kvm and machine maintainer
s390x: introduce 4.0 compat machine
s390x/zpci: drop msix.available
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 02acc1cc8a..83c127f0d6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -368,8 +368,9 @@ S: Maintained F: target/ppc/kvm.c S390 -M: Christian Borntraeger <borntraeger@de.ibm.com> +M: Halil Pasic <pasic@linux.ibm.com> M: Cornelia Huck <cohuck@redhat.com> +M: Christian Borntraeger <borntraeger@de.ibm.com> S: Maintained F: target/s390x/kvm.c F: target/s390x/kvm_s390x.h @@ -1075,6 +1076,7 @@ S390 Machines ------------- S390 Virtio-ccw M: Cornelia Huck <cohuck@redhat.com> +M: Halil Pasic <pasic@linux.ibm.com> M: Christian Borntraeger <borntraeger@de.ibm.com> S: Supported F: hw/char/sclp*.[hc] |