From nobody Fri Mar 15 10:13:42 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 4Tx0T24pslz5D5TL; Fri, 15 Mar 2024 10:13:42 +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 4Tx0T24NqFz41Yx; Fri, 15 Mar 2024 10:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710497622; 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=wbNzJyKDzIqPUVHaXMZSvpVxr/KzIrAcPtPEYqCq0x0=; b=Mja3RkEr8Bt2t6RPMz+6B59+h+NxRd9o1pNcTfk6Ub9mHRXuzy9LfVo48G/EmSgSm+Prkm Z3LJ0uEI6/xOlJ4SJAdH7bFO/IZqOzbZjlQ/EeA8VqAnQtoTEgsWINOy6gWMuXyoilABf0 qAXBwCNnl3WCzhseMiwR24R/RGAM/9uBn7RmEzXQn9buv6ZbNU1O6KuHd6KC2l88XlSLE3 7ptfO3ZImN00YcFp7/c4WLckNOsnnEtYFCyEA6rB783nb6iRUrTR9s+CARpbMj5kRYlYXo b+znLAEHNvzy1gb4orv1uY7qbkAL9WY6fJAIy+M/ZxaRZ6+dGXb/1Qr2eD5Rug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710497622; a=rsa-sha256; cv=none; b=oM96q1M0dO8hxaMz8568TZ9easkPqXbC546vqpzcDniVAzMEVjLbBV3XnbE5+bvLUB/SqT 1NCUuPeQpGGHxu2XtJUKxkSOoOiaCrIG6HGRHm/ZehyGAVJRRfItF98B9z/qSS1bZRD5sz llfCqHzoVJcSBfUhYj2wI9lJzWGGHWAdMY2/a4TYL9GRd2y3+bNpng+MxbX1MKjonBh1nY eqMJdOeEsArKxcUdtRKB2CD0NBtbIQQLIiLL0hK4llJKwooBPbPQ9nn6MJzubAyJmXROob UztOigmxuBgIZlg5o+jaMk//6bDFNBPXYEMeuPBRKXRH77zakDxT4bPfFzPhFw== 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=1710497622; 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=wbNzJyKDzIqPUVHaXMZSvpVxr/KzIrAcPtPEYqCq0x0=; b=f25yxWz3Wc9ejX0z72WxPe9yjEZO5xrLGIOcw0x13KRRVsIy5fpIL8w5Ah0EtWk7EqHLYH Hkv7hqQ+4ByZAs4pWNANU4n7stLY+gdoCLlnRd+owGZsTfTHYyswM3AOQiu90VtLctLmF4 YTLnKAQLujcIEZaDZQBSmKLNcQOTlv4V4ibUv71YjSjg/+V2xzVtPVAY552vsn8p7e8gUS 2wWBdo1ds1rH9KrudKBwlnFqeD++zTAvCdimr7t1b4jbbixcj+kX0kY3K3hERqm1Zb2MTU mjl7Q+r680iPKQbPHgIq6NeubL0jFw7j94niYX+Hvmhy5klJ4rcXdGs3S0aIrw== 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 4Tx0T2416Lz15lj; Fri, 15 Mar 2024 10:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42FADgCS024293; Fri, 15 Mar 2024 10:13:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42FADgbD024290; Fri, 15 Mar 2024 10:13:42 GMT (envelope-from git) Date: Fri, 15 Mar 2024 10:13:42 GMT Message-Id: <202403151013.42FADgbD024290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e1341e5318a8 - stable/13 - stable/13 sbin/mount_nullfs: Resolve conlict in man page 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e1341e5318a8f6b2a2712fae799cb5c59194ea03 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e1341e5318a8f6b2a2712fae799cb5c59194ea03 commit e1341e5318a8f6b2a2712fae799cb5c59194ea03 Author: Konstantin Belousov AuthorDate: 2024-03-15 10:10:46 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-15 10:12:51 +0000 stable/13 sbin/mount_nullfs: Resolve conlict in man page Reported by: Seigo Tanimura Pointy hat to: kib --- sbin/mount_nullfs/mount_nullfs.8 | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8 index 759f7546c49a..ed35ae310e63 100644 --- a/sbin/mount_nullfs/mount_nullfs.8 +++ b/sbin/mount_nullfs/mount_nullfs.8 @@ -90,17 +90,6 @@ flag followed by a comma separated string of options. See the .Xr mount 8 man page for possible options and their meanings. -<<<<<<< HEAD -||||||| parent of 4a2a69c4472c (mount_nullfs(8): document -o cache and vfs.nullfs.cache_vnodes) -Additionally the following option is supported: -.Bl -tag -width indent -.It Cm nocache -Disable metadata caching in the null layer. -Some lower-layer file systems may force this option. -Depending on the access pattern, -this may result in increased lock contention. -.El -======= Additionally the following option is supported: .Bl -tag -width nocache .It Cm nocache @@ -111,7 +100,6 @@ this may result in increased lock contention. .It Cm cache Force enable metadata caching. .El ->>>>>>> 4a2a69c4472c (mount_nullfs(8): document -o cache and vfs.nullfs.cache_vnodes) .El .Pp The