diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-03-23 15:38:30 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-03-23 15:38:30 +0000 |
| commit | 787f82407c5056a8b1097e39e53d01dd1abe406b (patch) | |
| tree | 1abdc37f97cbcc42f07824bafe9d2b0aa20eeafb /linux-user/linux_loop.h | |
| parent | 5f29856b852d055960a772d372ffe1bb2321b3f5 (diff) | |
| parent | 7722837369eb1c7e808021d79da68afa0c01c26f (diff) | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200323' into staging
- fix an off-by-one in the ipl code
- s390x documentation reordering
# gpg: Signature made Mon 23 Mar 2020 12:42:47 GMT
# 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-20200323:
s390/ipl: fix off-by-one in update_machine_ipl_properties()
Documentation: create/move s390x documentation
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/linux_loop.h')
0 files changed, 0 insertions, 0 deletions