From owner-dev-commits-src-all@freebsd.org Thu Apr 22 17:57:03 2021 Return-Path: Delivered-To: dev-commits-src-all@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 B4A275FA72E; Thu, 22 Apr 2021 17:57:03 +0000 (UTC) (envelope-from gbergling@gmail.com) Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR4qz4SqTz4ddp; Thu, 22 Apr 2021 17:57:03 +0000 (UTC) (envelope-from gbergling@gmail.com) Received: by mail-wm1-x331.google.com with SMTP id u187so5089630wmb.0; Thu, 22 Apr 2021 10:57:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=cgGDhjw5Kc6vnzslxl6tdEPNV5CkFRux7ImXp1WaApk=; b=GZwqoaRvVvVcajmsyewHDxRLp9j+8qcurew6l38I24adas0Q8i+snAcCmX/gNd5MsT PXiA6dqZrOmyZYUU1nElwGi4HJzH/yajnJIrrcj3n/h0ReFFejxf9e4OPU8D+nTbRSs2 cnUuZ+/BevAVuMhytJ/5FZDOetWTX8DSmG5BfxMZqXCVpST11O++UBaAPTXiDRU8Pc75 NfoH85OzPmMEW1cj16KrLkGzmfqv6to9NlBzQF+n/Mn2xRHm4d1R01Kakr7Vzbfns5OW rVhzhEx8fB0RKkSsRgw8B2demuxVMt2GNguahJ2VwRW6tXgrrNL8bLG9oyhXZD4xqogY /g/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=cgGDhjw5Kc6vnzslxl6tdEPNV5CkFRux7ImXp1WaApk=; b=qbrckdD8g/zZGm8xQ4NsWFmFe7sxBLtPvePhnEsi3QWk7X3/hMkTVIwa0SE8JwdXXx WB7g29Q+/k0S2hXWsaxgCH0/C9TLG9q+NgWvqaiwvBOGbfRIfFVewqnWMUC1bmwnRCa5 pK7mNunL2e98TE3Fvtfx4doQFolV+T9mvRbDTAbOJjEsm70DH41X8MRakpL3YMAhZ0Q7 4JDJFpbirs+PtBvpjALe4033qi7kS9wcOQDAgH6Sfmv6yPENfimRLRaJmSB+u4NaPzMm 1zg+6Gygn/w/x1wsO/uZkccYAN8PceKrl+5i8DP0DNCpw6qPOrJU5ks7ANjgsziocLkq de8g== X-Gm-Message-State: AOAM532EfLYdTLQEbMEyh9S8JeWTUA700+xdw2J3HT9DxFfsguP/iooC nAXq2I9dRegr1YNRq9oo2Lj8YR1WhiWsUQ== X-Google-Smtp-Source: ABdhPJxddCJabO2TxzmsmbLlUcc2pfryk1MEVdDaxu0xgf07XNzejiP+Tg/2E5Rjhlj+XUpZyQF9MA== X-Received: by 2002:a7b:c20c:: with SMTP id x12mr5118880wmi.51.1619114221791; Thu, 22 Apr 2021 10:57:01 -0700 (PDT) Received: from p200300d5d70db01f990fce91787a1a05.dip0.t-ipconnect.de (p200300d5d70db01f990fce91787a1a05.dip0.t-ipconnect.de. [2003:d5:d70d:b01f:990f:ce91:787a:1a05]) by smtp.gmail.com with ESMTPSA id p3sm6496764wmq.31.2021.04.22.10.57.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Apr 2021 10:57:01 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: git: 76b02b5cea1d - stable/12 - stats.7: Add dwatch(1) to the list From: Gordon Bergling In-Reply-To: Date: Thu, 22 Apr 2021 19:57:01 +0200 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202104221742.13MHgH0q019190@gitrepo.freebsd.org> <21943B45-EFA4-417A-8973-62D6F5BA31FA@gmail.com> To: =?utf-8?Q?Fernando_Apestegu=C3=ADa?= X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4FR4qz4SqTz4ddp X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 17:57:03 -0000 This is quite simple. $ git revert $HASH $ git push =E2=80=94Gordon > Am 22.04.2021 um 19:49 schrieb Fernando Apestegu=C3=ADa = : >=20 > On Thu, Apr 22, 2021 at 7:48 PM Gordon Bergling = wrote: >>=20 >> Hi Fernando, >>=20 >> could you please revert this. The stats(7) framework is only = available in stable/13 and -CURRENT as far as I know. >>=20 >> And you have committed a merge conflict (<<<<<<< HEAD). >=20 > Sorry about that. I was just updating the review to note the mess. >=20 > Can you point me to the procedure in the documentation on how to > revert the change _properly_? >=20 > Thanks >>=20 >> --Gordon >>=20 >>> Am 22.04.2021 um 19:42 schrieb Fernando Apestegu=C3=ADa = : >>>=20 >>> The branch stable/12 has been updated by fernape (doc, ports = committer): >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D76b02b5cea1dc548d30b2ec5e95ce5a2= 7deb16e3 >>>=20 >>> commit 76b02b5cea1dc548d30b2ec5e95ce5a27deb16e3 >>> Author: Fernando Apestegu=C3=ADa >>> AuthorDate: 2021-04-22 13:54:45 +0000 >>> Commit: Fernando Apestegu=C3=ADa >>> CommitDate: 2021-04-22 17:38:32 +0000 >>>=20 >>> stats.7: Add dwatch(1) to the list >>>=20 >>> PR: 255303 >>> Approved by: 0mp (mentor) >>> Differential Revision: https://reviews.freebsd.org/D29924 >>>=20 >>> (cherry picked from commit = 2e5929a75634504d388cc04d24e6a558840e18cb) >>> --- >>> share/man/man7/stats.7 | 10 +++++++++- >>> 1 file changed, 9 insertions(+), 1 deletion(-) >>>=20 >>> diff --git a/share/man/man7/stats.7 b/share/man/man7/stats.7 >>> index e72407c96fee..5ccba52057dc 100644 >>> --- a/share/man/man7/stats.7 >>> +++ b/share/man/man7/stats.7 >>> @@ -26,7 +26,7 @@ >>> .\" >>> .\" $FreeBSD$ >>> .\" >>> -.Dd May 14, 2020 >>> +.Dd April 22, 2021 >>> .Dt STATS 7 >>> .Os >>> .Sh NAME >>> @@ -46,6 +46,8 @@ are currently included in the base system, with = more appearing periodically. >>> Show Bluetooth socket information >>> .It Nm ctlstat >>> CAM Target Layer statistics utility >>> +.It Nm dwatch >>> +watch processes as they trigger a particular DTrace probe >>> .It Nm fstat >>> Identify active files >>> .It Nm gstat >>> @@ -87,6 +89,12 @@ Report virtual memory statistics >>> .It Nm zpool iostat >>> Report ZFS I/O statistics >>> .Sh SEE ALSO >>> +<<<<<<< HEAD >>> +=3D=3D=3D=3D=3D=3D=3D >>> +.Xr btsockstat 1 , >>> +.Xr dwatch 1 , >>> +.Xr fstat 1 , >>> +>>>>>>> 2e5929a75634 (stats.7: Add dwatch(1) to the list) >>> .Xr intro 1 , >>> .Xr intro 7 , >>> .Xr intro 8 , >>> _______________________________________________ >>> dev-commits-src-branches@freebsd.org mailing list >>> https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches >>> To unsubscribe, send any mail to = "dev-commits-src-branches-unsubscribe@freebsd.org" >>=20