Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200717' into staging

Fix typo in newly added documentation.

# gpg: Signature made Fri 17 Jul 2020 14:54:20 BST
# gpg:                using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg:                issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [marginal]
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>" [marginal]
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>" [marginal]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20200717:
  docs/s390x: fix vfio-ccw type

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
49 jobs for master in 67 minutes and 26 seconds (queued for 1 second)
Status Name Job ID Coverage
  Containers
passed amd64-centos7-container #645306139

00:02:27

passed amd64-centos8-container #645306140

00:02:17

passed amd64-debian10-container #645306141

00:02:13

passed amd64-debian11-container #645306142

00:01:55

passed amd64-debian9-container #645306143

00:02:12

passed amd64-fedora-container #645306146

00:03:15

passed amd64-ubuntu-container #645306150

00:02:20

passed amd64-ubuntu1804-container #645306148

00:02:28

passed amd64-ubuntu2004-container #645306149

00:02:59

passed cris-fedora-cross-container #645306145

00:02:06

passed i386-fedora-cross-container #645306147

00:02:13

passed xtensa-debian-cross-container #645306144

00:02:05

 
  Containers Layer2
passed alpha-debian-cross-container #645306152

00:02:20

passed amd64-debian-container #645306155

00:02:39

passed amd64-debian-cross-container #645306153

00:02:25

passed amd64-debian-user-cross-container #645306154

00:03:00

passed amd64-debian9-mxe-container #645306151

00:02:15

passed arm64-debian-cross-container #645306156

00:02:28

passed arm64-test-debian-cross-container #645306157

00:02:08

passed armel-debian-cross-container #645306158

00:02:24

passed armhf-debian-cross-container #645306159

00:02:25

passed hppa-debian-cross-container #645306160

00:02:20

passed m68k-debian-cross-container #645306161

00:02:18

passed mips-debian-cross-container #645306164

00:02:23

passed mips64-debian-cross-container #645306162

00:02:21

passed mips64el-debian-cross-container #645306163

00:02:28

passed mipsel-debian-cross-container #645306165

00:02:29

passed powerpc-debian-cross-container #645306166

00:02:22

passed ppc64-debian-cross-container #645306167

00:02:21

passed ppc64el-debian-cross-container #645306168

00:02:28

passed riscv64-debian-cross-container #645306169

00:02:16

passed s390x-debian-cross-container #645306170

00:02:26

passed sh4-debian-cross-container #645306171

00:02:16

passed sparc64-debian-cross-container #645306172

00:02:17

passed tricore-debian-cross-container #645306173

00:02:12

 
  Containers Layer3
passed win32-debian-cross-container #645306174

00:02:22

passed win64-debian-cross-container #645306175

00:02:23

 
  Build
passed build-clang #645306181

00:40:17

passed build-disabled #645306178

00:27:20

passed build-fuzzer #645306182

00:35:35

passed build-system-fedora-alt #645306177

00:30:53

passed build-system-ubuntu-main #645306176

00:37:28

passed build-tcg-disabled #645306179

00:21:34

passed build-tci #645306183

00:27:42

passed build-user #645306180

00:33:42

 
  Test
passed acceptance-system-fedora-alt #645306187

00:14:36

passed acceptance-system-ubuntu-main #645306185

00:14:40

passed check-system-fedora-alt #645306186

00:18:53

passed check-system-ubuntu-main #645306184

00:23:01