diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-22 15:42:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-22 15:42:23 +0100 |
| commit | 834b9273d5cdab68180dc8c84d641aaa4344b057 (patch) | |
| tree | c6be3eb86a2fa267d85f16122592b6e3c868fd98 /scsi/pr-manager-helper.c | |
| parent | 4dad0a9aa818698e0735c8352bf7925a1660df6f (diff) | |
| parent | 639b090df52a4952262615328a3fdfae81234ea8 (diff) | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging
Pull request trivial patches 20200919
# gpg: Signature made Sat 19 Sep 2020 19:43:35 BST
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-for-5.2-pull-request:
contrib/: fix some comment spelling errors
qapi/: fix some comment spelling errors
disas/: fix some comment spelling errors
linux-user/: fix some comment spelling errors
util/: fix some comment spelling errors
scripts/: fix some comment spelling errors
docs/: fix some comment spelling errors
migration/: fix some comment spelling errors
qemu/: fix some comment spelling errors
scripts/git.orderfile: Display meson files along with buildsys ones
hw/timer/hpet: Fix debug format strings
hw/timer/hpet: Remove unused functions hpet_ram_readb, hpet_ram_readw
meson: remove empty else and duplicated gio deps
manual: escape backslashes in "parsed-literal" blocks
ui/spice-input: Remove superfluous forward declaration
hw/ppc/ppc4xx_pci: Replace magic value by the PCI_NUM_PINS definition
hw/gpio/max7310: Remove impossible check
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scsi/pr-manager-helper.c')
| -rw-r--r-- | scsi/pr-manager-helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scsi/pr-manager-helper.c b/scsi/pr-manager-helper.c index b531dae2e8..451c7631b7 100644 --- a/scsi/pr-manager-helper.c +++ b/scsi/pr-manager-helper.c @@ -125,7 +125,7 @@ static int pr_manager_helper_initialize(PRManagerHelper *pr_mgr, qio_channel_set_delay(QIO_CHANNEL(sioc), false); pr_mgr->ioc = QIO_CHANNEL(sioc); - /* A simple feature negotation protocol, even though there is + /* A simple feature negotiation protocol, even though there is * no optional feature right now. */ r = pr_manager_helper_read(pr_mgr, &flags, sizeof(flags), errp); |