From owner-dev-commits-src-branches@freebsd.org Thu Apr 22 17:48:42 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 CF0885FA484; Thu, 22 Apr 2021 17:48:42 +0000 (UTC) (envelope-from gbergling@gmail.com) Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) (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 4FR4fL4rt2z4d4S; Thu, 22 Apr 2021 17:48:42 +0000 (UTC) (envelope-from gbergling@gmail.com) Received: by mail-wr1-x42e.google.com with SMTP id p6so38989271wrn.9; Thu, 22 Apr 2021 10:48:42 -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=ohcOMYw0PtGFWqfwG/6e7pqRGykbzLyzbmjU7sv1BcQ=; b=TZCNNMr7Hs8mekuBjsP/E1r7so7durC+l0IvLuwQPXKdP4GzQkVoe8UK1DkWrRAHNg 7UbdTEcx/x7U11kUzqZ+yqz95kQmijbmX0qCrctRaEz49nvKwG5o1VDwfnL73wdV4lGN btR+x+5+3W/x63cxZC6rsf7B5ZPJJjL86TTanIJtLvpEWfdygeAeWLyI0eld2Icz79As x8EGdOODiMTVy5u5jyAzZvFlV2tZE9/QXNvO9IGlnKp8QqV12nK2WbBfXG1C/JmZqGdO 4XOEb7ExFsKzNYLoCJnyyanuoG1ctU/sS4ASdqGXTXROy1/bOmMHxlBkRCDNk8NLoEKH KORA== 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=ohcOMYw0PtGFWqfwG/6e7pqRGykbzLyzbmjU7sv1BcQ=; b=jZe7TrnfmlUDlrTnszkpNmF7ZaUiGr3PfXDQpLcCJei+cBholp9fEB/6LcjOgd9cac p74EjcpHi9pKy03pQMnKSsHCrfDrxFl+G+aPynSEkN5/ME7ZbEWRnYAo3bJwz3YzQMvf EjSyFxplbVL10AoqqDZ7+EbBfccUrOuWumZogaGlGO2m/SDs85LSZt73oX/T3tQWCeGB SeT32KYW/yywV5TseUyPHmfyLM471m7Ka1b6bitGsdVcIVvdIvbtENtktUkZiiHIAEtm WIyZOyRoQT7Kvl5zYFKTB2P7uAU4Rda4pCshRhZbSn5UXnJR1yf2SnV/ZONZjIy0aTiQ PqxQ== X-Gm-Message-State: AOAM530OJ3lKO7PTvL2PFLqnkieuNDaEo/fR6auZqLjLT3iize8T9UuE wQDLKQsiLi4TCCjGGZfO2ea9w+lpE+MDww== X-Google-Smtp-Source: ABdhPJyCbgJkeM2/68jhejFfVptfjBMWklCriVoqn6wjXauxDGXeO7RCV/ciaOhl0SGaZfH0iHv0Hg== X-Received: by 2002:adf:dc8d:: with SMTP id r13mr5515864wrj.339.1619113721278; Thu, 22 Apr 2021 10:48:41 -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 n9sm3965952wmo.27.2021.04.22.10.48.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Apr 2021 10:48:40 -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: <202104221742.13MHgH0q019190@gitrepo.freebsd.org> Date: Thu, 22 Apr 2021 19:48:40 +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: <21943B45-EFA4-417A-8973-62D6F5BA31FA@gmail.com> References: <202104221742.13MHgH0q019190@gitrepo.freebsd.org> To: =?utf-8?Q?Fernando_Apestegu=C3=ADa?= X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4FR4fL4rt2z4d4S 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-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: Thu, 22 Apr 2021 17:48:42 -0000 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). --Gordon > 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"