From nobody Wed Jul 30 18:47:43 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 4bsh6h23xyz62tyX; Wed, 30 Jul 2025 18:47:56 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bsh6g5W6jz3FSl; Wed, 30 Jul 2025 18:47:55 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-il1-f174.google.com with SMTP id e9e14a558f8ab-3e3f6ae4d08so293035ab.1; Wed, 30 Jul 2025 11:47:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753901275; x=1754506075; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rJWMg91mZv2nRfRHG+ZNoX8Yhk56BVxlRkVdjF4TcCQ=; b=q9iu9Mvu60bVWSOd8uSR+m+sxn/0thiBUPI842xtoAt8HhugfeQCXtGVqRxS3w0or0 UBtzLb5flcxr0vu9K0wzxoAbOhNDc1a8I4fcjWdk1uf1TJgfn7xxK1ySWeuO7XAIXP4n q17qjbMSaHJAYQK2Unu5BcAm2ue8Q4vebg5zj7oU1FgXJbla66uXwbFn8JTA7kxxAF3c sp8szU0eXVp3QkM5J0r0O3S4VHbET1BAQHs786MAk2qEGQOUHM5GIl5D+O2B8lGw2I4N dFHM0mK5xcVH5RcZ6Sw1p7n63zQtgXAsHifqaxVvzz8LInyEHpxrTBGKwF5JfzgkM/9x yiUA== X-Forwarded-Encrypted: i=1; AJvYcCWXD4cW4onQSl0awIew912QiWvhoq8Zq3uR5To6s6aVEcmMmSmGsyzTukr42EMlSlYPB0EQtLGXOdrOLUBB71vEGUlC@freebsd.org, AJvYcCWaVunFJm89+SlkJsuHHe1bDs3arJvisg1wjzm+pjwU28WgYYe/Ca45v4VgN1d9g/VhSAJPDcKAjqEnwo6xJ34=@freebsd.org, AJvYcCX6nL84wFTLis1YVeJL8zw0RovFTj4L2nXAnwHpr93ZT6QgnaZiw4V323C7j6i8NdPIEmj/IyjxNxj7/nbHQIIcONw7dQgdtEhI@freebsd.org X-Gm-Message-State: AOJu0Yz2WA0n8WKc/pOI0p7Ziw3XlPuyPvqtuxpNf3hz889V1pRRftMq QiTAFnlRTC7o7dJNkaMzS4X7FtfzlkMov63NZUwXUYhI4a+5FwUqCSbOVNcxK92/HKVZqM/LIdY 0A4g7WuI3b4P8cmIPUxI+XOrN97m5Xrw93vou X-Gm-Gg: ASbGncs30VNXwmXpOTg8VY62FME4X1NySjtt4ZbteWppGyfgjp4N+SWONAI4b8IrO81 ry8C1UqYEkew5I7mY5HNtArc8BwvVP9zrKx8tGNn/xh8kZoem0RALT0mSRiB8aKyVyjfMSiEPrP LbsdrN8Xar6Tw5b/LYQ/OfDVW+XSnZjVaYrbI355iPByU3bBON2/mSHFyajmY3QMjrC5wRGmVXh Lc+USo= X-Google-Smtp-Source: AGHT+IHQpxAVUD4u6ECRLJJOQQif+OBRprL1Mz+rFPQGdKBkotx5SUoihug9eT0FJ1ftEDmhqoZKyYDxDT5hh+aWYgY= X-Received: by 2002:a05:6e02:4506:10b0:3e3:b35a:e8ff with SMTP id e9e14a558f8ab-3e3e930b406mr86164035ab.6.1753901274462; Wed, 30 Jul 2025 11:47:54 -0700 (PDT) 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 References: <202507300936.56U9aujh087527@gitrepo.freebsd.org> In-Reply-To: From: Ed Maste Date: Wed, 30 Jul 2025 14:47:43 -0400 X-Gm-Features: Ac12FXwAz1DZWT0ePWPnrPhDmDSIHCeUyPD8tkiaaiI0CvXjZKn4VxzKL9JTe5k Message-ID: Subject: Re: git: 0c91fa982437 - stable/14 - dtrace_fbt.4: Document the DTrace fbt provider To: "Bjoern A. Zeeb" Cc: Mateusz Piotrowski <0mp@freebsd.org>, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4bsh6g5W6jz3FSl X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On Wed, 30 Jul 2025 at 10:31, Bjoern A. Zeeb 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 > > > > 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/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.