From nobody Mon Sep 23 04:51:35 2024 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 4XBrDm0bn7z5WYsc; Mon, 23 Sep 2024 04:51:36 +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 4XBrDl4KVSz4hlx; Mon, 23 Sep 2024 04:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727067095; 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=SY7id2u8UzSu1WZ8u8byVhQFPJpYUgHdv51Q0QuMhGw=; b=d0LoSzrpsRZykkv7bMnlHHP+OpGy0/0NinUY8jn4QhRyVbrEVOr/uVgNNqZi9G2Pbj4GKC EwnMXqsyt4NC6v2fJnOW564CnkEC8gklwEfAM640nzF+Jzl5rZnx/hfKzEEdx6XNWtpxYn y6GvN4Han5ahwNPvC02arBGnbKn/vSMlcytsVcZyQfX70ev1KZij1XXKFvYLGi4nvBaAA+ tE6dhR4itrhy9m7W/aNxR4cxAuTvddsceI/D8rdexIXN+K0fHBen2vY3MPGBE5R8Wt/Ji5 MlLjRnFZPOG4tsGmwBd4VHKyBPGSSzeIKoOGF71QAck0lTRFOFhgeWQoSbLQJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727067095; a=rsa-sha256; cv=none; b=OhjnALJ0mrYAXmbCRcwRRTNw7ahf01Vwv+cum0w2xFThRU1yE1Lt8nXdkyZK1dCjuudZa4 PC3dOHoaB381SL4+MTocFsGG2Qwcjnqz7bfFBGFQOqw4pDkrAOd3GMSlJb1YiB9j7COYYv vH6pn+pBvFbHhNm7UC+oED/Xyk40zXSsyUeiYHtC3H56/31bpv1LXOqf6TtkyzdmT5IAKU iRP30eIYCJJAAT3MhAhxWyIZS21gXm3jF3yHMBvZhGuByXqFdBdO1NAijZPfiXF2B22M3C j8hrFJpAmnGfxF4twBF91iFrFILfjIwy/+1B2fQUl208YsPBtJVGUXC57EItgQ== 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=1727067095; 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=SY7id2u8UzSu1WZ8u8byVhQFPJpYUgHdv51Q0QuMhGw=; b=HS9ae7amluy7SCD/mIJlytueB4QCTh5XHchbSnVXrqABmKLSodD2qtrkXdjB6nkksUCP+E PNw47jtkYR/VYvMJ+sXFJBL+lp54WWcIl+Dp7dhzw1v1nTdbRawJPEQYrrlt8crIiflQL5 zgkKUtPNDL/YM7aR7bxzzJKOMkJc88FYcU0LA/rgr9E5goctnbLbfaMIxE1D8ZCsw9hTRF 5IsgEEbuQ2Zwa+kz6cW3jLihM7XxMhiUn3fvW7SSTqy3XGOzxywuC8tBqE+pdUAtvR4rEc Gn7tHPPJ5zpp9hKGDnsLg9wbLT+fSCZhrCmV0i1pJv78HedvIEmflVZrh3xOUQ== 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 4XBrDl3ln5zXQx; Mon, 23 Sep 2024 04:51:35 +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 48N4pZio069520; Mon, 23 Sep 2024 04:51:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48N4pZ1D069517; Mon, 23 Sep 2024 04:51:35 GMT (envelope-from git) Date: Mon, 23 Sep 2024 04:51:35 GMT Message-Id: <202409230451.48N4pZ1D069517@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: 0a389bc09bda - stable/13 - bluetooth(3): Fix two typos in source code comments 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/13 X-Git-Reftype: branch X-Git-Commit: 0a389bc09bdab3a8174876e971f88eefe3a693ab Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0a389bc09bdab3a8174876e971f88eefe3a693ab commit 0a389bc09bdab3a8174876e971f88eefe3a693ab Author: Gordon Bergling AuthorDate: 2024-09-20 18:00:04 +0000 Commit: Gordon Bergling CommitDate: 2024-09-23 04:51:26 +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 9814d9e0bceb..f5fd0605faee 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. */