Date: Wed, 30 Jul 2025 13:21:35 -0700 From: Ravi Pokala <rpokala@freebsd.org> To: Ed Maste <emaste@freebsd.org>, "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net> Cc: Mateusz Piotrowski <0mp@freebsd.org>, <src-committers@freebsd.org>, <dev-commits-src-all@freebsd.org>, <dev-commits-src-branches@freebsd.org> Subject: Re: 0c91fa982437 - stable/14 - dtrace_fbt.4: Document the DTrace fbt provider Message-ID: <3EA9D815-0483-4A2A-A568-00023FB66744@panasas.com> In-Reply-To: <CAPyFy2A1D0NdxD7vVDrG5ZQP=U0gnBfzeV=nZdcJ_LhhBvamdA@mail.gmail.com> References: <202507300936.56U9aujh087527@gitrepo.freebsd.org> <sroo78rp-5r3r-1qo3-84on-r316rq9qo582@yvfgf.mnoonqbm.arg> <CAPyFy2A1D0NdxD7vVDrG5ZQP=U0gnBfzeV=nZdcJ_LhhBvamdA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
I think the same mis-merge went into stable/13 as well... -Ravi =EF=BB=BF-----Original Message----- From: <owner-src-committers@freebsd.org <mailto:owner-src-committers@freebs= d.org>> on behalf of Ed Maste <emaste@freebsd.org <mailto:emaste@freebsd.org= >> Date: Wednesday, July 30, 2025 at 11:47 To: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net <mailto:bzeeb-lists@li= sts.zabbadoz.net>> Cc: Mateusz Piotrowski <0mp@freebsd.org <mailto:0mp@freebsd.org>>, <src-com= mitters@freebsd.org <mailto:src-committers@freebsd.org>>, <dev-commits-src-a= ll@freebsd.org <mailto:dev-commits-src-all@freebsd.org>>, <dev-commits-src-b= ranches@freebsd.org <mailto:dev-commits-src-branches@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 <bzeeb-lists@lists.zabbadoz.net <mailto:bzeeb-lists@lists.zabbadoz.net>> 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 <https://cgit.FreeBSD.org/src/commit/?id=3D0c91fa982437417e0921= 8ad8c2428aff29d9c5bd> > > > > commit 0c91fa982437417e09218ad8c2428aff29d9c5bd > > Author: Mateusz Piotrowski <0mp@FreeBSD.org <mailto:0mp@FreeBSD.org>> > > AuthorDate: 2025-06-14 19:26:48 +0000 > > Commit: Mateusz Piotrowski <0mp@FreeBSD.org <mailto: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 <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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3EA9D815-0483-4A2A-A568-00023FB66744>