From nobody Sat Nov 08 19:02:29 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 4d3lfs3ZBZz6GQq3; Sat, 08 Nov 2025 19:02:29 +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 4d3lfs2B48z40d1; Sat, 08 Nov 2025 19:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628549; 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=rBoff5+T/nb19osYNrUV6iBnHWVakx1DFX6KDYVSqQM=; b=PcnShYes/Xahkpw1R5DZafbf2zo+g4/C9UoYvwPIk14N1pqStJBFBje58fW5ZseJZPfVq6 wCeWoTPdJ6vqZ30SnNMaf6b21PWyZdVLkwzWfxUY5vbuJghyblve5dlrleUipAGdcpZDT1 9skah6IuqF/q4VC87XeAp85medaHfS2+73EQqaAREI1EZJO9rY1+x723WNNKgBKzeZ3qB9 bEqi7ssd2iDyaL4jHE2f+ki1bsDlSwHJVyGUK3Ao4kG/jjB1W/IsVxi9ztXRZkiInu1W0J daUKXYimcKF0PCdyZAxV3Qvrq68UGA6ES/Mv52M1uEeRtdQMthmmWJqmGJ65gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762628549; 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=rBoff5+T/nb19osYNrUV6iBnHWVakx1DFX6KDYVSqQM=; b=HF9xg8HMioryy0vAyG74ere/k72bDHNsZR2gPVdzhcV78JoE9rsYCVOEOeoek8J2Fv9kvl Lau/xwrkpp7ecaiMApiavmvs6f9qA49OQAxKgFxUrYLA+6E42sgKsHX1g10pqDzQSnh4PN VzgVHH8jwMaG5GvEmNbw90bAXwMYX7SyslagobemRoNme4xJaTd/iUJv1NTD1XUxzhQqoc D8p+Sxp9Vo+scTTtAqU0attxEPSZtXEKgnKxYbjYS/WOj4oatZeXgTW+1WiOpg44hhTVnf tkWfQ0RX+ZKGL7BtiDpg3Rs09kEJHOJ6yP0VLbxy2VWMsmXaZfAz7crOYMwvHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762628549; a=rsa-sha256; cv=none; b=GxALdIyGfbMwxDlq5ttfmrpZxuypx+j3qiKy1sinXMGgN/nzn+xOyPSurzI3KQLju7X3LQ d0D1VNhRdDC/zSj1cAU2RtwgtcUNvthAWoPahu4usGLMFu31+4rz/4920/3souCMNDvaWx yeF3KB0MBWT44rCQKSdrztzdIhMBQXFeOiKg6q1iHGdPTN5K3Oi8va8Mo5cTl1sfMcw+77 4FGCdlslzqUDIpthi+G1vVS8vwFlf9YwdEmgazPCcATasxIIHBYCt+nLY+2YoIouC5N1PH tF4oGH1BNhTtYAE+n+q7k3PDWbQFNMOECsshL3yWyaqHDgx4eb8Z2ilVUjvWfA== 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 4d3lfs1nTNzyNm; Sat, 08 Nov 2025 19:02:29 +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 5A8J2TZi072653; Sat, 8 Nov 2025 19:02:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A8J2TVY072621; Sat, 8 Nov 2025 19:02:29 GMT (envelope-from git) Date: Sat, 8 Nov 2025 19:02:29 GMT Message-Id: <202511081902.5A8J2TVY072621@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: f7e8178ce193 - stable/15 - cam: Fix three 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: f7e8178ce193813e8ff23e02b75864abc888d81b Auto-Submitted: auto-generated The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f7e8178ce193813e8ff23e02b75864abc888d81b commit f7e8178ce193813e8ff23e02b75864abc888d81b Author: Gordon Bergling AuthorDate: 2025-10-29 08:23:51 +0000 Commit: Gordon Bergling CommitDate: 2025-11-08 19:02:18 +0000 cam: Fix three typos in kernel messages - s/maximun/maximum/ - s/queing/queueing/ - s/exhausing/exhausting/ (cherry picked from commit adfe14dcc2747a20dff961044d6817c507087327) --- sys/cam/ctl/ctl.c | 2 +- sys/cam/scsi/scsi_enc.c | 2 +- sys/cam/scsi/scsi_enc_ses.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index e110281f7c85..442ef1d30542 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -2123,7 +2123,7 @@ ctl_remove_initiator(struct ctl_port *port, int iid) mtx_assert(&softc->ctl_lock, MA_NOTOWNED); if (iid > CTL_MAX_INIT_PER_PORT) { - printf("%s: initiator ID %u > maximun %u!\n", + printf("%s: initiator ID %u > maximum %u!\n", __func__, iid, CTL_MAX_INIT_PER_PORT); return (-1); } diff --git a/sys/cam/scsi/scsi_enc.c b/sys/cam/scsi/scsi_enc.c index 9705a0b890b4..65df32ead371 100644 --- a/sys/cam/scsi/scsi_enc.c +++ b/sys/cam/scsi/scsi_enc.c @@ -732,7 +732,7 @@ enc_update_request(enc_softc_t *enc, uint32_t action) { if ((enc->pending_actions & (0x1 << action)) == 0) { enc->pending_actions |= (0x1 << action); - ENC_DLOG(enc, "%s: queing requested action %d\n", + ENC_DLOG(enc, "%s: queueing requested action %d\n", __func__, action); if (enc->current_action == ENC_UPDATE_NONE) wakeup(enc->enc_daemon); diff --git a/sys/cam/scsi/scsi_enc_ses.c b/sys/cam/scsi/scsi_enc_ses.c index 435874a9874a..57eb2b1155b7 100644 --- a/sys/cam/scsi/scsi_enc_ses.c +++ b/sys/cam/scsi/scsi_enc_ses.c @@ -1623,7 +1623,7 @@ ses_process_status(enc_softc_t *enc, struct enc_fsm_state *state, } else { if (cur_stat <= last_stat) ENC_VLOG(enc, "Status page, exhausted objects before " - "exhausing page\n"); + "exhausting page\n"); enc_update_request(enc, SES_PUBLISH_CACHE); err = 0; }