From owner-dev-commits-src-all@freebsd.org Thu Apr 22 17:53:07 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 B2E795FA51F; Thu, 22 Apr 2021 17:53:07 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) (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 4FR4lR3lYFz4dS4; Thu, 22 Apr 2021 17:53:07 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: by mail-qt1-f172.google.com with SMTP id 18so21059110qtz.6; Thu, 22 Apr 2021 10:53:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=KslEm9Y4+QuZSc9OIgmBVhOAJUnTKnNn0rgJvEcNwQ0=; b=MkwKblIYLTCkJNgueIsP1Pbkc/NDU7JrZ1a6/gL8fxZ/tHd+lG0JQ9J3u3kmz2/a58 oOTIcWk8u29NGG+FUQ5rTugu30VRYphdJ7oA+toxvIwNsHtC6fgXtjl3lHqH1zw+uVcZ eOTIIu7Gn/sxlvUCd+M2biOXGFjXpZVmLjWaF2hnn2BW8uEi6mD3TlxjAhl7Y+SrW2aZ MoFGLdkwdOY+VvH2zRYgC+/xecG5Lnd+ZvGtn8VmSZpLpxJe67ICEurRiw7ytZvz5a9A yhYp2Cc9o+5pZmNQlhx/ytOTRn6+tGiZIHwIso4KJ03dRkUnjl7lV+3gD0bITZKyZor0 bGJQ== X-Gm-Message-State: AOAM533NoIkk+tRLIc3ZqeoM0qMrAIKwrxSyMUQOX/zC6RqCNGtvzo7O 8seWMS1rS9IlIy/4Ij4LM2SxRJCeryssew== X-Google-Smtp-Source: ABdhPJwCiDzTskKSFWzWuh3InI0vkDnoAkZwROJSsC/DDYQ5UYiGRAJ7ENwXS1rO+FUYLwPa0/1ZRQ== X-Received: by 2002:a05:622a:18a:: with SMTP id s10mr4268909qtw.237.1619113985906; Thu, 22 Apr 2021 10:53:05 -0700 (PDT) Received: from mail-yb1-f171.google.com (mail-yb1-f171.google.com. [209.85.219.171]) by smtp.gmail.com with ESMTPSA id 198sm2674517qkf.20.2021.04.22.10.53.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 22 Apr 2021 10:53:05 -0700 (PDT) Received: by mail-yb1-f171.google.com with SMTP id p3so31836420ybk.0; Thu, 22 Apr 2021 10:53:05 -0700 (PDT) X-Received: by 2002:a25:b746:: with SMTP id e6mr7022965ybm.187.1619113985416; Thu, 22 Apr 2021 10:53:05 -0700 (PDT) MIME-Version: 1.0 References: <202104221742.13MHgH0q019190@gitrepo.freebsd.org> <21943B45-EFA4-417A-8973-62D6F5BA31FA@gmail.com> In-Reply-To: <21943B45-EFA4-417A-8973-62D6F5BA31FA@gmail.com> From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Thu, 22 Apr 2021 19:49:37 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 76b02b5cea1d - stable/12 - stats.7: Add dwatch(1) to the list To: Gordon Bergling Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4FR4lR3lYFz4dS4 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.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:53:07 -0000 On Thu, Apr 22, 2021 at 7:48 PM Gordon Bergling wrote= : > > Hi Fernando, > > could you please revert this. The stats(7) framework is only available in= stable/13 and -CURRENT as far as I know. > > And you have committed a merge conflict (<<<<<<< HEAD). Sorry about that. I was just updating the review to note the mess. Can you point me to the procedure in the documentation on how to revert the change _properly_? Thanks > > --Gordon > > > Am 22.04.2021 um 19:42 schrieb Fernando Apestegu=C3=ADa : > > > > The branch stable/12 has been updated by fernape (doc, ports committer)= : > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D76b02b5cea1dc548d30b2ec5= e95ce5a27deb16e3 > > > > 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 > > > > stats.7: Add dwatch(1) to the list > > > > PR: 255303 > > Approved by: 0mp (mentor) > > Differential Revision: https://reviews.freebsd.org/D29924 > > > > (cherry picked from commit 2e5929a75634504d388cc04d24e6a558840e18cb) > > --- > > share/man/man7/stats.7 | 10 +++++++++- > > 1 file changed, 9 insertions(+), 1 deletion(-) > > > > 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" >