From nobody Wed Jul 30 20:21:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bskBs3F9dz630DN; Wed, 30 Jul 2025 20:21:41 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bskBs1rrbz3S4h; Wed, 30 Jul 2025 20:21:41 +0000 (UTC) (envelope-from rpokala@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753906901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hnHx4hswra/VtlqfbF6JEeep9tjwLVY8IN8eibjCbtk=; b=LqshndovbByo1drpbNskWO0N7fYb1l4/f9ptMUVoeQUhgw2NeDntjD2XDx0qJyHryxBQjY nfHFLrGBaFb2U2x14qB4mLPjf6yuik/C+mcL1eaOhJvb54jtSL4VtNcV7oq0K+IBcUH3mt 7Pn94VoO6petMaMkk+YlnQ9x+ZOg5pM/kBGSkzKzGPuFoRcUcDR27NnwoIDWhnCpfqxa/S IxSerO8cEMfYr7mvky/K8vjsnDPc9fScXbr7BbLIbXLtTEnekexuyydhOMwi97JFd8/gt7 6dy9hImM0jJMHQsLJi9O5SA5+w/a5jUUwsL1tR/E+1ARPippe5jMDuyFJg5M5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753906901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hnHx4hswra/VtlqfbF6JEeep9tjwLVY8IN8eibjCbtk=; b=N2drSir/OVliaUeAoqd54bYJOorOMCXME+Cx/7q0PPJlCqNkXue+Dlzrh4xbfXze8IC2xj 0OIZQnKLGHPm85ggtUB2H9M5HBoMK4l9fGUeHP69eNeSavM8sW1uATsnwggdFyNhcjWWMz JIrg3FQOzVJGEo6yNWQZTD6Ap+KeXclsjvtZvXSkaR/AZnW1fKMmzDVtRIboEtqIbeGT8n Ym0L50yW8J6QfOcKhps6IuFv42StKrq0uPuubiM6SPcrHvaNLsXBqPd49AsjDcWlq2FhZP krzerf8hOV7LedG+CM/nubuMLYKGAn2JfUdHtIt04Wqol04l/SIeidETZxSUCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753906901; a=rsa-sha256; cv=none; b=AI0kT1yRUOR8uWI3at3yh74RoGXKxaD3oWKyTRJ5bz+nfrJAmbtuGQ7J5Lkv9OGFhAtT2z pp8B6YQFvdXK5BOHhvx+u299QSubyXQ5zzMHEJX5N3OmaaGjtBCAPA4cGLUuqjWAdvnXXa r7mDJVwk7z8sUMvNR32cpJeTYdwgArgFNPdCTyEbtuBP7rZX7Xs1Ixa0S7bwBGTVAp0YJf vuxiVPGxP9bzpJxbbW0zkWZCJoSfGLvkg1LjKQm++hrQTeI9FXgReTM8G7r21lqAKCVeCz 3t/zzaZ79D2UbhngvJyhMmFSGXRcmkEOF9KB8IBGuC8m3rQdN77xrqHB8+RcfA== Received: from [172.17.5.122] (unknown [204.148.112.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id 4bskBr2Mvvz1874; Wed, 30 Jul 2025 20:21:40 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.99.25072013 Date: Wed, 30 Jul 2025 13:21:35 -0700 Subject: Re: 0c91fa982437 - stable/14 - dtrace_fbt.4: Document the DTrace fbt provider From: Ravi Pokala To: Ed Maste , "Bjoern A. Zeeb" CC: Mateusz Piotrowski <0mp@freebsd.org>, , , Message-ID: <3EA9D815-0483-4A2A-A568-00023FB66744@panasas.com> Thread-Topic: 0c91fa982437 - stable/14 - dtrace_fbt.4: Document the DTrace fbt provider References: <202507300936.56U9aujh087527@gitrepo.freebsd.org> In-Reply-To: List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-version: 1.0 Content-type: text/plain; charset="UTF-8" Content-transfer-encoding: quoted-printable I think the same mis-merge went into stable/13 as well... -Ravi =EF=BB=BF-----Original Message----- From: > on behalf of Ed Maste > Date: Wednesday, July 30, 2025 at 11:47 To: "Bjoern A. Zeeb" > Cc: Mateusz Piotrowski <0mp@freebsd.org >, >, >, > Subject: Re: git: 0c91fa982437 - stable/14 - dtrace_fbt.4: Document the DTr= ace fbt provider On Wed, 30 Jul 2025 at 10:31, Bjoern A. Zeeb > wr= ote: > > On Wed, 30 Jul 2025, Mateusz Piotrowski wrote: > > > The branch stable/14 has been updated by 0mp: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D0c91fa982437417e09218ad8c2= 428aff29d9c5bd > > > > commit 0c91fa982437417e09218ad8c2428aff29d9c5bd > > Author: Mateusz Piotrowski <0mp@FreeBSD.org > > > AuthorDate: 2025-06-14 19:26:48 +0000 > > Commit: Mateusz Piotrowski <0mp@FreeBSD.org > > > CommitDate: 2025-07-30 09:36:44 +0000 > > > > dtrace_fbt.4: Document the DTrace fbt provider > > > > Reported by: markj > > Reviewed by: christos, markj (earlier version), ziaee > > Obtained from: Mark Johnston, DTrace, FreeBSD Journal, May 2014 > > Obtained from: https://wiki.freebsd.org/DTrace/One-Liners > > MFC after: 2 weeks > > Relnotes: yes > > > > (cherry picked from commit 9388c2887817d7162ebb356b39aa9b4ab67a8c00) > > --- > > cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 5 + > > share/man/man4/Makefile | 1 + > > share/man/man4/dtrace_fbt.4 | 332 +++++++++++++++++++++++++++ > > share/man/man4/dtrace_kinst.4 | 12 +- > > 4 files changed, 346 insertions(+), 4 deletions(-) > > > > diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contri= b/opensolaris/cmd/dtrace/dtrace.1 > > index 1836707d72df..9cb6e9dd276f 100644 > > --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 > > +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 > > @@ -20,7 +20,11 @@ > > .\" > > .\" $FreeBSD$ > > .\" > > +<<<<<<< HEAD > > .Dd June 14, 2025 > > +=3D=3D=3D=3D=3D=3D=3D > > +.Dd July 16, 2025 > > +>>>>>>> 9388c2887817 (dtrace_fbt.4: Document the DTrace fbt provider) > > > This merge conflict wasn't resolved? Someone submitted a PR for it and I've fixed it now.