This is quite simple. $ git revert $HASH $ git push
—Gordon > Am 22.04.2021 um 19:49 schrieb Fernando Apesteguía <fern...@freebsd.org>: > > On Thu, Apr 22, 2021 at 7:48 PM Gordon Bergling <gbergl...@gmail.com> 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ía <fern...@freebsd.org>: >>> >>> The branch stable/12 has been updated by fernape (doc, ports committer): >>> >>> URL: >>> https://cgit.FreeBSD.org/src/commit/?id=76b02b5cea1dc548d30b2ec5e95ce5a27deb16e3 >>> >>> commit 76b02b5cea1dc548d30b2ec5e95ce5a27deb16e3 >>> Author: Fernando Apesteguía <fern...@freebsd.org> >>> AuthorDate: 2021-04-22 13:54:45 +0000 >>> Commit: Fernando Apesteguía <fern...@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 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 >>> +======= >>> +.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-branc...@freebsd.org mailing list >>> https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches >>> To unsubscribe, send any mail to >>> "dev-commits-src-branches-unsubscr...@freebsd.org" >> _______________________________________________ dev-commits-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
