From owner-dev-commits-src-branches@freebsd.org Sun Feb 28 05:06:31 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DA2CE5602FC; Sun, 28 Feb 2021 05:06:31 +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 4DpBFM5sLvz4sFj; Sun, 28 Feb 2021 05:06:31 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B796C26EF; Sun, 28 Feb 2021 05:06:31 +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 11S56Vkm030694; Sun, 28 Feb 2021 05:06:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11S56V9m030693; Sun, 28 Feb 2021 05:06:31 GMT (envelope-from git) Date: Sun, 28 Feb 2021 05:06:31 GMT Message-Id: <202102280506.11S56V9m030693@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Guangyuan Yang Subject: git: aed45a13aea9 - stable/11 - pwrite(2): remove git message that committed by accident MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ygy X-Git-Repository: src X-Git-Refname: refs/heads/stable/11 X-Git-Reftype: branch X-Git-Commit: aed45a13aea9db0b24299a10f0eac8192776b141 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2021 05:06:31 -0000 The branch stable/11 has been updated by ygy (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=aed45a13aea9db0b24299a10f0eac8192776b141 commit aed45a13aea9db0b24299a10f0eac8192776b141 Author: Guangyuan Yang AuthorDate: 2021-02-28 04:48:04 +0000 Commit: Guangyuan Yang CommitDate: 2021-02-28 05:06:07 +0000 pwrite(2): remove git message that committed by accident Fix the manpage after accidentally committed 3-way merge info in 1350f1ccc156299c4de2772afa8784283c8f6ab4. --- lib/libc/sys/write.2 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/libc/sys/write.2 b/lib/libc/sys/write.2 index 75574adb0996..95f0ca9c0532 100644 --- a/lib/libc/sys/write.2 +++ b/lib/libc/sys/write.2 @@ -28,11 +28,7 @@ .\" @(#)write.2 8.5 (Berkeley) 4/2/94 .\" $FreeBSD$ .\" -<<<<<<< HEAD -.Dd October 23, 2017 -======= .Dd February 11, 2021 ->>>>>>> 504e64af32ba (pwrite(2): add a BUGS section) .Dt WRITE 2 .Os .Sh NAME @@ -291,9 +287,6 @@ system call appeared in The .Fn write function appeared in -<<<<<<< HEAD -.At v6 . -======= .At v1 . .Sh BUGS The @@ -309,4 +302,3 @@ writes into regardless of whether .Dv O_APPEND is set. ->>>>>>> 504e64af32ba (pwrite(2): add a BUGS section)