From nobody Tue Apr 18 06:09:44 2023 X-Original-To: dev-commits-src-main@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 4Q0tmm5ppbz45pLY; Tue, 18 Apr 2023 06:09:44 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q0tmm2JyBz4GKD; Tue, 18 Apr 2023 06:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681798184; 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=B43ql6G+B494HEJxnnPStiB1FMbAmR4wITwNEly1qcM=; b=UnWQbtrVSsLQBWdIHNTdl2ZpCys1uBRc55eC8l+B3eT+mQpOEYtuqnBfaxyjYVKKuDFdqO fL05eUzo9DFmCbVf9AEwdvtv8dAeaqEPakk5KnIbhk/UC2auNaGD/Vvpqa5RTgsQfvT6c5 nH+Z3ZEnx5eo7ITSbD26WFjQEuEFWtLo78XaAgDBK5l9uX/VMTnA6rx1qD967+FpkxWipL ZiwOa/Qge+pN12wZX5sho8C3Y5FnYC7ik3txzKdjEn4hayK7y8FEA8ZeGaa+BiDcrKMoo4 aWBMuq9++rLhgEKp6CxDH8DPeU+CIkVIIJU47CqiZvL2T++hMHk+hLK/YaUPTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681798184; 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=B43ql6G+B494HEJxnnPStiB1FMbAmR4wITwNEly1qcM=; b=N0dm9kbpjcCGt5uAx5zSDH15AX2tm4JdPbSHDqxNjeOC9uuMvBK6NCRf+Yhzd/faO2y3V5 /av3+rNtb5TWJReBl4XX8+fKvnY0P2kEzIMcwG0XpdAV6V7cMq8opuWJIfQOjjSlE9eeBu xxm7psR0pCx5pXBzx+CKxhaWc9WOUrVyIl0n33RqkOw64RSyU+m2Am98VBEG9r1NDtqWMu 5VIl7vYgBLPyvEQ3sYcMV/Kv5qc/5ja5bUvrJqSoO/HAFAdmwk+HDfJMJXsNmyT5jZmEPs 40hxv3/lIKrhIENQexQl4mihk5TiN8500gpJxysqZsbRdx72h/tRT3rbB2rkqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681798184; a=rsa-sha256; cv=none; b=kynp5u76ZPFnvrPj/q1lizN470qnYZSSL8QCEpCzSkGkXTYAVIcOeUmxnFGVEenQGzCoiT ezcpqJvgq9gYuTXFITveNvbbJdnSW0dEo5CWwPNS6l54Eum6AQTafnRbRcFemrPzfy0AaZ 3DIjSAwXFnJRbXMQF1S5m2LMItYV9zRmzTgR23yfjx/ZrxVEd1yiBVh4QDC7arSx03XdhP TPXBIuWF7jmEUEopApAxVV/+uapLCU2lZ0JFQcETIRZI3f/7eIFFZtxctV5iaPmrOBBmf1 ChZbV73/CtzDrzN5DJbz4Y8dHFpQUizhR8xvmPgJMh/8i3yshEZglB+75ReoeA== 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 4Q0tmm1C5Tz116B; Tue, 18 Apr 2023 06:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33I69iQN089391; Tue, 18 Apr 2023 06:09:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33I69iRq089390; Tue, 18 Apr 2023 06:09:44 GMT (envelope-from git) Date: Tue, 18 Apr 2023 06:09:44 GMT Message-Id: <202304180609.33I69iRq089390@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: c3fbd9c6212c - main - Revert "stand: Remove double words in source code comments" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c3fbd9c6212cad2634f5958ffec0370166ec7204 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c3fbd9c6212cad2634f5958ffec0370166ec7204 commit c3fbd9c6212cad2634f5958ffec0370166ec7204 Author: Gordon Bergling AuthorDate: 2023-04-18 06:08:35 +0000 Commit: Gordon Bergling CommitDate: 2023-04-18 06:08:35 +0000 Revert "stand: Remove double words in source code comments" The sentence, "The base address that we the boot0 code to to run it." is correct. Reported by: jrtc27 This reverts commit b12ccd0bb1b37f32e972bb3e945e4025fe409e2f. --- stand/i386/boot0/Makefile | 2 +- stand/libsa/zfs/zfsimpl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/i386/boot0/Makefile b/stand/i386/boot0/Makefile index dad078fd6f71..1453f17751b9 100644 --- a/stand/i386/boot0/Makefile +++ b/stand/i386/boot0/Makefile @@ -36,7 +36,7 @@ BOOT_BOOT0_FLAGS?= 0x8f # 0xb6 (182d) corresponds to 10 seconds. BOOT_BOOT0_TICKS?= 0xb6 -# The base address that we the boot0 code to run it. Don't change this +# The base address that we the boot0 code to to run it. Don't change this # unless you are glutton for punishment. BOOT_BOOT0_ORG?= 0x600 ORG=${BOOT_BOOT0_ORG} diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index 4a285470642e..76063e76225f 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -447,7 +447,7 @@ vdev_indirect_mapping_entry(vdev_indirect_mapping_t *vim, uint64_t index) * * It's possible that the given offset will not be in the mapping table * (i.e. no mapping entries contain this offset), in which case, the - * return value depends on the "next_if_missing" parameter. + * return value value depends on the "next_if_missing" parameter. * * If the offset is not found in the table and "next_if_missing" is * B_FALSE, then NULL will always be returned. The behavior is intended