From nobody Mon Sep 23 04:51:10 2024 X-Original-To: dev-commits-src-all@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 4XBrDG69zYz5WYY3; Mon, 23 Sep 2024 04:51:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XBrDG4lnpz4hRT; Mon, 23 Sep 2024 04:51:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727067070; 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=GxKE9qbVld103G0ymvtYXgNxnHPrx1cbDYi2mXYD57I=; b=iPnOODKgieHHSb8e7+mMy7H1UvPjDYhYiPuVzdavckbicsB1QKIoNtAqrkKksmBeBb6HrY gbavmyhDzrghfajKxX0luuAcSzhHEK/YmtvuqIRm3fV33aDZXkblWd9yq1nAkHBupp6ipC iWtLcbO0uS4X1UDYWyqsvevSU+c8Gei6mA2Na0/Uoxl6d84NGDFMJpxC3IaOqoB7lGHfEF DVZ7ekqEyTzAShBiKLgJK6pWjzebeQp90kqmZbkeaej0lmFISLCGDJ9MUdF6Ss4j7x6wSN u4iFA64FlDUoeCmbyyOomQhPjLeY7Ec58J+LL7pSW3Z7bYz89WBBlCBjC06nHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727067070; a=rsa-sha256; cv=none; b=uEa0UypUEIyjIYftDzYrmOjtaroWAC0r7Nnpfz4zvR1lzdN000Dl93jmIYUyrxWqh5Jsii MbQ47TO2DbiVjNVmXRE/YueqIYaxQeQNE+TZi9ogAP95x4gyq8imm9zBjH6NiiZQ//dTFX 2oROqaVEJaiJEKvdRfuYDqqgmxQU95nBEWfKR6U65nX9qPFbzUbXk/cIHGM5rjtRItOpe6 trEu/SW+GWywYNdUcnQOHwdkeHHUIadABqc1tCmJ49gEYkk1NZ3EG39z4taA+bfBEn7pM3 h5ybyJpPJSefy2RYTleDt/UyAWNTNjUM7nMa6L2ZdV56YntBBHoHYYXy/ohyOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727067070; 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=GxKE9qbVld103G0ymvtYXgNxnHPrx1cbDYi2mXYD57I=; b=qfVrP9cYjC9R9Xa9hKTmD6pYztlh7MEdFb20zsSXdpOKVXnEBBGPKZVfWgG6aBBIIp5VEt e6bQlKmjrpFATfCaT6xFsyvU3+U8mW6mclaY6OD8DiDT7Bkyw9MaGH1aBeqanjICSOnwWT ZFiExF1beJbX4t9bw5RrE5pjoMWTAX9qyIgk2LvCDjdC5fBNdzLG3ir9+NeMmm9s7syRBG Gbp9iXCqxpjN5e1n13V6dTWq0Fxc0g0uzJnbz5Yx5IqY2DFrOPo/sWIJ4J/M5933C4fzVi frajdrleoHWEmMEckq93bqwh1r6U4Pm+CG+fi4P7QZct2CF36oRp7KTTdPufuQ== 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 4XBrDG4MM6zXcs; Mon, 23 Sep 2024 04:51:10 +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 48N4pAlg069191; Mon, 23 Sep 2024 04:51:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48N4pAn5069188; Mon, 23 Sep 2024 04:51:10 GMT (envelope-from git) Date: Mon, 23 Sep 2024 04:51:10 GMT Message-Id: <202409230451.48N4pAn5069188@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: 82db15028e43 - stable/14 - bluetooth(3): Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 82db15028e434076e30db683958792741306c8c7 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=82db15028e434076e30db683958792741306c8c7 commit 82db15028e434076e30db683958792741306c8c7 Author: Gordon Bergling AuthorDate: 2024-09-20 18:00:04 +0000 Commit: Gordon Bergling CommitDate: 2024-09-23 04:50:34 +0000 bluetooth(3): Fix two typos in source code comments - s/conficts/conflicts/ (cherry picked from commit 9046ecff409c45205aad34ef8d959d79dd20cf8f) --- sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c index 8fc64bb70929..f232b3d390bc 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c @@ -789,7 +789,7 @@ ng_btsocket_l2cap_process_l2ca_cfg_req_rsp(struct ng_mesg *msg, if (op->result == NG_L2CAP_SUCCESS) { /* * XXX FIXME Actually set flush and link timeout. - * Set QoS here if required. Resolve conficts (flush_timo). + * Set QoS here if required. Resolve conflicts (flush_timo). * Save incoming MTU (peer's outgoing MTU) and outgoing flow * spec. */ @@ -991,7 +991,7 @@ ng_btsocket_l2cap_process_l2ca_cfg_ind(struct ng_mesg *msg, /* * XXX FIXME Actually set flush and link timeout. Set QoS here if - * required. Resolve conficts (flush_timo). Note outgoing MTU (peer's + * required. Resolve conflicts (flush_timo). Note outgoing MTU (peer's * incoming MTU) and incoming flow spec. */