From nobody Wed Nov 19 11:14:48 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 4dBJm84cJSz6HXmT for ; Wed, 19 Nov 2025 11:14:48 +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 4dBJm83lwkz3T6P for ; Wed, 19 Nov 2025 11:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550888; 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=KPeQsf1OFI1D6ImgydGO/UMGfsusn3mcStIGjGVX1bg=; b=bi3/CDYyblOGRRCl3q6/+bu1KZgCLa0YOf/4dwNXOxjyPnQT7pc7HDIHJTMXOyJARLLT5Y a2OSIsAXoi+HfuddpIXttluufog9y/eWpZdCFRbAS6P2FixZ38yc/+ZVXJBxsN43ZzZkF1 dOBAk3OfUcQZqTzYEvaBhGq/U7jrwOLdJp3/zxy01Iboef5aD2YAcRs7S+iNqZvYDHR+PB Jikv1nGGVgROcX2A7FWOncof+B2k0R/mgOm7i9IMM8iPYGNXYtkR8lOMSBVmCYypKLh91+ 6f19pcSQlTis21KpYO/jchMrrnJHANgsE9b/malmUIEq3mHxkhcCGU/nmEemSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550888; 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=KPeQsf1OFI1D6ImgydGO/UMGfsusn3mcStIGjGVX1bg=; b=V5fzudO8h5OxqDl8TQsSDZKqvkhY6MqgfYerPIHwioqcY9iNNp696kXxjyRTXccVPDBmN6 Ih64Jp+Ux2GOqXPJdxs5fA2zym2y662VvmAYBj+u09DUzdNrgclJdwjRfzgpM90T+te7G4 9hsm04Nmu6fLrPBEuamJx9/BYnwyPFBWf8MM0o9AJmk/Zv/d+qbkAOQIGm+zDcZ+qVXxuy uNsHHqhLCgc1ADeIJWJCTwuqzRLVV9FXAJRm/lb8YKsEX7ihx4/FMHt9pa1yFZVa/wZC+X Lkqh8KNgjvS63Fc8RvxtglCPo8lHeaH0m7WdjHW+MGBmqHiYUv29VIrD34azjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763550888; a=rsa-sha256; cv=none; b=nu8E/BMraHnGDRsKICmgKP+FuRolRB0KthRAmlSs1YZZ8Nd4muOid4PxIfXg98QiKU/9eI FX8cDps5vNURQRC2TjA9RNg67WWFIsqdjNK5xrWWsufzLy30zA6i8WRZ4oa8FaXSyp7PGe XBITEHT3tmdfeZeplSqo7xRmX2v0ZHAEoS5r2yAnxAZIbCr1Aq+cLP4NKvh9iBiqTRkmaB qAdERsuR8RgEUiLoX8Bs69A+Eub0xzxPesdrENVjIS/mbqCQLUOyI20Fg6HuX3B3rgTcHa +Xr0Vbl3ynk1p2bcsGlbA9FkLRtQ1SDL38k/QBM6pxtespjj1O40KRkfbpnRPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJm8378LzfDy for ; Wed, 19 Nov 2025 11:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9c2d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:14:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 8f381ddfa4fc - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 8f381ddfa4fc9943c1b7c1e75fd2eb0020e9caa6 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:14:48 +0000 Message-Id: <691da6a8.9c2d.5a5c0f4d@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8f381ddfa4fc9943c1b7c1e75fd2eb0020e9caa6 commit 8f381ddfa4fc9943c1b7c1e75fd2eb0020e9caa6 Author: Gordon Bergling AuthorDate: 2025-10-28 08:11:11 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:14:36 +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);