Date: Thu, 22 Apr 2021 19:56:17 +0200 From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= <fernape@freebsd.org> To: Gordon Bergling <gbergling@gmail.com> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org>, "dev-commits-src-branches@freebsd.org" <dev-commits-src-branches@freebsd.org> Subject: Re: git: 76b02b5cea1d - stable/12 - stats.7: Add dwatch(1) to the list Message-ID: <CAGwOe2Z3UXatEBcjqT5kzAW_CCy_fUUu6OAhN6TYqVhdRfyr1g@mail.gmail.com> In-Reply-To: <D71136E4-13D1-49E7-A895-72D7AB09B4D5@gmail.com> References: <202104221742.13MHgH0q019190@gitrepo.freebsd.org> <21943B45-EFA4-417A-8973-62D6F5BA31FA@gmail.com> <CAGwOe2aynmxby5sc8_s_nUDDgji=ZPEPH--RxjEKVryXoZQaVA@mail.gmail.com> <D71136E4-13D1-49E7-A895-72D7AB09B4D5@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Apr 22, 2021 at 7:57 PM Gordon Bergling <gbergling@gmail.com> wrote= : > > This is quite simple. > > $ git revert $HASH > $ git push Should be fixed now. Thanks > > =E2=80=94Gordon > > > Am 22.04.2021 um 19:49 schrieb Fernando Apestegu=C3=ADa <fernape@freebs= d.org>: > > > > On Thu, Apr 22, 2021 at 7:48 PM Gordon Bergling <gbergling@gmail.com> w= rote: > >> > >> 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 <fernape@free= bsd.org>: > >>> > >>> The branch stable/12 has been updated by fernape (doc, ports committe= r): > >>> > >>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D76b02b5cea1dc548d30b2e= c5e95ce5a27deb16e3 > >>> > >>> commit 76b02b5cea1dc548d30b2ec5e95ce5a27deb16e3 > >>> Author: Fernando Apestegu=C3=ADa <fernape@FreeBSD.org> > >>> AuthorDate: 2021-04-22 13:54:45 +0000 > >>> Commit: Fernando Apestegu=C3=ADa <fernape@FreeBSD.org> > >>> 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 mor= e 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-unsubscrib= e@freebsd.org" > >> >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGwOe2Z3UXatEBcjqT5kzAW_CCy_fUUu6OAhN6TYqVhdRfyr1g>