From nobody Thu Oct 30 08:11:00 2025 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 4cxxdJ5BdZz6FHGY; Thu, 30 Oct 2025 08:11:00 +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 4cxxdJ3mlyz3kRd; Thu, 30 Oct 2025 08:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761811860; 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=Ti21a75JWIRO+WA6Px5FPFO1mMEl4uxaLjQ3y0KAyNY=; b=qXEiAgZTB8KwWtljVpwXNYoxlnO2ZJuT/p9J+hG5+3EHGX3AOWlg7exEbPn1zd64ldx7Cd wQ5fgJC8gQYkAuhSYK/M/NxQC9BRwIiQbjJDNCt+y276HH18cekj49M3BEIbuWXMIo57af 7ctwh8cQ65WNrGKEHUyaxTs8Be3B5GkINf73MJ6HCdlkLYRBF+UjGHTOEotcHgLjqPDscx fK7Y51SoEpfkgv2PUfQgY2qmMm7yD2oWdxkW3v/2GC0+0XDQ/3poreT3C2nvRuA8Oyla6v raZzWFJynYtzPipT5cus2DgsQIbPqEP6GlZQQWiLp91f+HraOn9ip7UInjZUfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761811860; 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=Ti21a75JWIRO+WA6Px5FPFO1mMEl4uxaLjQ3y0KAyNY=; b=OEJ/BQvEEdLuaJlTjGA+K41gNaCUdVV8NvEMV8LgTcFyEtEpxL4q+dynCV2vij+53noIsS tTHNkSfthQnw8QAYfzuDZsK5itbYfcGa1xjqG4Q1oFXFhb/473Kk2kq8J9S2d5RX/YYCt1 023Mt4ZjzR4FiVXaGvXdllg2q+ZMpoArFHGetgtYpPsX0mvj3lO5E51sq+zvhOnTAaXHh6 EJNTW95prqyvKqnHnJ0EwEFAVNoA9uKPaze65gJh55+y/pTP2q7yPpyht/AbiUL8LkFZ/M cw/05lOeJjAhLyVma/CgtqM4ZtHU/CL/50hxl2z8QbbJzMtiNmPGHV4oHjqkHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761811860; a=rsa-sha256; cv=none; b=apVgPqK4f665UDWzYwT5SqEFTEyPDLZwNp4n5zxAorojcLeYUOYBb7k928TiG43cMTYJ6N Mz7FZarozc7d0R9EwRe3PqpTmJj4xxm9Hq0JrcUtitOo1apWKWd+NdUvZNU2oPg8xPgfFc 8JeOxgtsWCs2Qc4sxNKGY8FI2yETONhoiD/jynE4Y9mj4/edetiLDHYP+nHv/0JTsP5KCl 0WTwjd1Zxaax9tNA56yQmvQ5oSmt4YL0d7qkDvtHpyO7emn4/hNS/AdAOfqQZBJVsAsB4p g1cy9qNVxXVgUrh7OMDM1HpTPJZskA61pTrpEVHgfGLoTuJJksCJLjHP2kE6nQ== 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 4cxxdJ3MqHz1CrF; Thu, 30 Oct 2025 08:11:00 +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 59U8B04A014074; Thu, 30 Oct 2025 08:11:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U8B04m014071; Thu, 30 Oct 2025 08:11:00 GMT (envelope-from git) Date: Thu, 30 Oct 2025 08:11:00 GMT Message-Id: <202510300811.59U8B04m014071@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: 28290a18e217 - stable/14 - ffs.3: Fix an accidentally committed merge left over 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: 28290a18e217ed5837549e1ee022766403d63133 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=28290a18e217ed5837549e1ee022766403d63133 commit 28290a18e217ed5837549e1ee022766403d63133 Author: Gordon Bergling AuthorDate: 2025-10-30 08:07:00 +0000 Commit: Gordon Bergling CommitDate: 2025-10-30 08:07:00 +0000 ffs.3: Fix an accidentally committed merge left over Fix an accidentally committed merge left over. Fixes: 38a172d3c6b7 ("ffs.3: Add a STANDARDS section to the manual page") --- lib/libc/string/ffs.3 | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/libc/string/ffs.3 b/lib/libc/string/ffs.3 index 9e0b39dce573..1cca54c0b30b 100644 --- a/lib/libc/string/ffs.3 +++ b/lib/libc/string/ffs.3 @@ -27,9 +27,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -<<<<<<< HEAD -.\" @(#)ffs.3 8.2 (Berkeley) 4/19/94 -.\" .Dd October 25, 2025 .Dt FFS 3 .Os