With Martin's continuing approval, here is the s390x part of the patch.
Attach a file by drag & drop or click to upload
