I think the same mis-merge went into stable/13 as well... -Ravi
-----Original Message----- From: <owner-src-committ...@freebsd.org <mailto:owner-src-committ...@freebsd.org>> on behalf of Ed Maste <ema...@freebsd.org <mailto:ema...@freebsd.org>> Date: Wednesday, July 30, 2025 at 11:47 To: "Bjoern A. Zeeb" <bzeeb-li...@lists.zabbadoz.net <mailto:bzeeb-li...@lists.zabbadoz.net>> Cc: Mateusz Piotrowski <0...@freebsd.org <mailto:0...@freebsd.org>>, <src-committ...@freebsd.org <mailto:src-committ...@freebsd.org>>, <dev-commits-src-all@freebsd.org <mailto:dev-commits-src-all@freebsd.org>>, <dev-commits-src-branc...@freebsd.org <mailto:dev-commits-src-branc...@freebsd.org>> Subject: Re: git: 0c91fa982437 - stable/14 - dtrace_fbt.4: Document the DTrace fbt provider On Wed, 30 Jul 2025 at 10:31, Bjoern A. Zeeb <bzeeb-li...@lists.zabbadoz.net <mailto:bzeeb-li...@lists.zabbadoz.net>> wrote: > > 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=0c91fa982437417e09218ad8c2428aff29d9c5bd > > > > <https://cgit.FreeBSD.org/src/commit/?id=0c91fa982437417e09218ad8c2428aff29d9c5bd> > > > > commit 0c91fa982437417e09218ad8c2428aff29d9c5bd > > Author: Mateusz Piotrowski <0...@freebsd.org <mailto:0...@freebsd.org>> > > AuthorDate: 2025-06-14 19:26:48 +0000 > > Commit: Mateusz Piotrowski <0...@freebsd.org <mailto:0...@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/contrib/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 > > +======= > > +.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.
