From nobody Sat Nov 08 20:11:22 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d3nBL72Smz6GVvG; Sat, 08 Nov 2025 20:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3nBL31HZz49KJ; Sat, 08 Nov 2025 20:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=up4m7QXambkAPvjy2OGS/PaPKrUh/JCvlvpMQv5wY44=; b=OXj121VPQasCMFpnC2IRYd9HahxP+FvglJPm/2GrXYTK4NdzIpK2oaGhuBMGah7Euxoax6 exiuInQWr8HQsbwZhuK5jMu8KtL+e3jGiJK4gTN0CYgp4CY3KEUvUWqwlyD6gCA/JdnSNZ YxtyxgJrOgtL2rLSY0MLeOUkKKVVotwmdjgmegcRLR7vwHPJ9/2qPpQtY1aojHxzLE9ZyC YzXV+G77bbgMjsF48lM8/ghmMRskTaV94IRV/1Vep0CEvejFpFngF3gaGwznXeB4WNtjxE zEz/HYT92S4TWl+zxtazGHTnI4KHqie8KFoNPoaNOQTAezeYPeFvHVSBZ0xQTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762632682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=up4m7QXambkAPvjy2OGS/PaPKrUh/JCvlvpMQv5wY44=; b=IctuhjPF8Birj72qjZS15y7HcxTOnbgOuszsxIw4PjSJN6706Wo+a1ounTjEZ+bcqxUii4 rffD2DFj88sxCWne2jh73or8Mk+lHesw/OJiJXuGc67hkifQy+h+Xdo8QZ5m9uxfcy/37k xYTPFtF8yhXRs29UbHN6scP4wt+LMaag7LtBJkYDOYoUaY+/yTKybakMv6Paxo9TsdhZ7F h0LMUj5k2JjaydRC3Pbmsp1JyfOLSozwL9/9UXYiPMIj+kLYsn42hBpXR06Ews2+LXid0z iXn+Zb/BuPwE1bohXDKbueF33q2/tiRwqmSEWOwD/U3kJv7yYFvX69/lDEiobQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762632682; a=rsa-sha256; cv=none; b=hw88J0+BMhQsQL6eIFRrdc3r5mSvc7nyDXHICnqIqiBAz+4jwjKxLRAiNLIBD2lQP6PJKp vjKqgrSEZYLFUExCuK8I6LHQu5Cjxqz2HGHVWYgWRAZovvNXLvgd6fnRD2VrjnponlNpMH 3cJHWK7q1zNyU6/dSanwfQ5A8j5bxV6wj+5RY6RR1MWZ3yCwiAD4YT88Un0yQVSshJ/rfE PwThvlY64UcAeaQ+NIdv1KyFxWU1cM+w5bjEB/uEs4ey9kWQwkJvQwQimPu44tpcdObEUw W/2hiJafziS0ViNlEWkJx+4L9A2wXReyG5CvGljzgXxN5FK1qCBUmOz0PRqgrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3nBL2Xx1z10FL; Sat, 08 Nov 2025 20:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A8KBMr7003483; Sat, 8 Nov 2025 20:11:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8KBMmG003480; Sat, 8 Nov 2025 20:11:22 GMT (envelope-from git) Date: Sat, 8 Nov 2025 20:11:22 GMT Message-Id: <202511082011.5A8KBMmG003480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 38b3f633036e - stable/15 - ocs_fc(4): Fix a couple of typos in kernel messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 38b3f633036e69fe326b359eb8246853ac29af1f Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=38b3f633036e69fe326b359eb8246853ac29af1f commit 38b3f633036e69fe326b359eb8246853ac29af1f Author: Gordon Bergling AuthorDate: 2025-10-28 08:11:11 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 20:11:09 +0000 ocs_fc(4): Fix a couple of typos in kernel messages - s/unexpectd/unexpected/ - s/Unexected/Unexpected/ - s/niether/neither/ - s/sucessfully/successfully/ - s/Inavlid/Invalid/ - s/toplogy/topology/ (cherry picked from commit aa0cd9e5b4d21b11097e1c21a3c0eb23525c15c3) --- sys/dev/ocs_fc/ocs_device.c | 2 +- sys/dev/ocs_fc/ocs_els.c | 4 ++-- sys/dev/ocs_fc/ocs_gendump.c | 4 ++-- sys/dev/ocs_fc/ocs_ioctl.c | 2 +- sys/dev/ocs_fc/ocs_scsi.c | 2 +- sys/dev/ocs_fc/ocs_xport.c | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_device.c b/sys/dev/ocs_fc/ocs_device.c index 7f0c5526b1c3..d9c283541d3c 100644 --- a/sys/dev/ocs_fc/ocs_device.c +++ b/sys/dev/ocs_fc/ocs_device.c @@ -825,7 +825,7 @@ __ocs_d_init(ocs_sm_ctx_t *ctx, ocs_sm_event_t evt, void *arg) ocs_node_transition(node, __ocs_d_wait_topology_notify, NULL); break; default: - node_printf(node, "received PLOGI, with unexpectd topology %d\n", + node_printf(node, "received PLOGI, with unexpected topology %d\n", node->sport->topology); ocs_assert(FALSE, NULL); break; diff --git a/sys/dev/ocs_fc/ocs_els.c b/sys/dev/ocs_fc/ocs_els.c index c62f71d4eb4f..cf4f01477f69 100644 --- a/sys/dev/ocs_fc/ocs_els.c +++ b/sys/dev/ocs_fc/ocs_els.c @@ -314,7 +314,7 @@ _ocs_els_io_free(void *arg) ocs_list_remove(&node->els_io_pend_list, els); els->els_pend = 0; } else { - ocs_log_err(ocs, "assertion failed: niether els->els_pend nor els->active set\n"); + ocs_log_err(ocs, "assertion failed: neither els->els_pend nor els->active set\n"); ocs_unlock(&node->active_ios_lock); return; } @@ -363,7 +363,7 @@ ocs_els_make_active(ocs_io_t *els) } else { /* must be retrying; make sure it's already active */ if (!els->els_active) { - ocs_log_err(node->ocs, "assertion failed: niether els->els_pend nor els->active set\n"); + ocs_log_err(node->ocs, "assertion failed: neither els->els_pend nor els->active set\n"); } } ocs_unlock(&node->active_ios_lock); diff --git a/sys/dev/ocs_fc/ocs_gendump.c b/sys/dev/ocs_fc/ocs_gendump.c index 83155d90c3a3..6a1abfefadfc 100644 --- a/sys/dev/ocs_fc/ocs_gendump.c +++ b/sys/dev/ocs_fc/ocs_gendump.c @@ -153,7 +153,7 @@ ocs_gen_dump(ocs_t *ocs) ocs_log_test(ocs, "Failed to see dump after 30 secs\n"); rc = -1; } else { - ocs_log_debug(ocs, "sucessfully generated dump\n"); + ocs_log_debug(ocs, "successfully generated dump\n"); } /* now reset port */ @@ -219,7 +219,7 @@ ocs_fdb_dump(ocs_t *ocs) return -1; } - ocs_log_debug(ocs, "sucessfully generated dump\n"); + ocs_log_debug(ocs, "successfully generated dump\n"); } else { ocs_log_err(ocs, "dump request to hw failed\n"); diff --git a/sys/dev/ocs_fc/ocs_ioctl.c b/sys/dev/ocs_fc/ocs_ioctl.c index 71ba17d5f72a..d3cea434b2be 100644 --- a/sys/dev/ocs_fc/ocs_ioctl.c +++ b/sys/dev/ocs_fc/ocs_ioctl.c @@ -796,7 +796,7 @@ ocs_sys_fwupgrade(SYSCTL_HANDLER_ARGS) break; default: ocs_log_warn(ocs, - "Unexected value change_status: %d\n", + "Unexpected value change_status: %d\n", fw_change_status); break; } diff --git a/sys/dev/ocs_fc/ocs_scsi.c b/sys/dev/ocs_fc/ocs_scsi.c index af9fc798b01c..1bbf60b9014b 100644 --- a/sys/dev/ocs_fc/ocs_scsi.c +++ b/sys/dev/ocs_fc/ocs_scsi.c @@ -720,7 +720,7 @@ ocs_scsi_build_sgls(ocs_hw_t *hw, ocs_hw_io_t *hio, ocs_hw_dif_info_t *hw_dif, o case OCS_HW_DIF_BK_SIZE_520: blocksize = 520; break; case OCS_HW_DIF_BK_SIZE_4104: blocksize = 4104; break; default: - ocs_log_test(hw->os, "Inavlid hw_dif blocksize %d\n", hw_dif->blk_size); + ocs_log_test(hw->os, "Invalid hw_dif blocksize %d\n", hw_dif->blk_size); return -1; } for (i = 0; i < sgl_count; i++) { diff --git a/sys/dev/ocs_fc/ocs_xport.c b/sys/dev/ocs_fc/ocs_xport.c index d997ea245132..9e69bf0ed98f 100644 --- a/sys/dev/ocs_fc/ocs_xport.c +++ b/sys/dev/ocs_fc/ocs_xport.c @@ -482,12 +482,12 @@ ocs_xport_initialize(ocs_xport_t *xport) /* Setup persistent topology based on topology mod-param value */ rc = ocs_topology_setup(ocs); if (rc) { - ocs_log_err(ocs, "%s: Can't set the toplogy\n", ocs->desc); + ocs_log_err(ocs, "%s: Can't set the topology\n", ocs->desc); return -1; } if (ocs_hw_set(&ocs->hw, OCS_HW_TOPOLOGY, ocs->topology) != OCS_HW_RTN_SUCCESS) { - ocs_log_err(ocs, "%s: Can't set the toplogy\n", ocs->desc); + ocs_log_err(ocs, "%s: Can't set the topology\n", ocs->desc); return -1; } ocs_hw_set(&ocs->hw, OCS_HW_RQ_DEFAULT_BUFFER_SIZE, OCS_FC_RQ_SIZE_DEFAULT);