From nobody Tue Apr 28 19:41:39 2026 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 4g4rRQ2KvDz6c0vZ for ; Tue, 28 Apr 2026 19:41:54 +0000 (UTC) (envelope-from ctuffli@gmail.com) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 4g4rRP5TZ3z48mD for ; Tue, 28 Apr 2026 19:41:53 +0000 (UTC) (envelope-from ctuffli@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2ab232cc803so57183635ad.3 for ; Tue, 28 Apr 2026 12:41:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777405312; x=1778010112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=i0b3REP1cN6e4gCXA01q9TLAYmGtAwcL08hx4wn4rTY=; b=fli6HIdfwb2uNG2QIn92F+AW/Og7MQL/dGi2mOcEA6/DQ0QUm8YsvuotvK/385SJdD sevBh032Bb6EphyueQS+9VFl6lwPXT9u4bMPhPtVGN/24NwZ68UFiT2BczqtULT+RD9Q SfR5E0QOZOpUrgDIifOBPTFa4W5yCRWf+oOG8rRsay7aM9PvRZDa7huDGdn53obcejFV VEA0gSAFEP2KwCE3VDq9Fp8ZmnBWjVnyTQ3GBloIeLEW//9fD8nW9GJvSCLuBKMYoNk8 rZkfpjwzktwPE1sMjgQsrt5TEbsEo3xmlmxfZwolhtMq6IKYN2dhJbGrL5Kv9b8AIlbI iPoA== X-Forwarded-Encrypted: i=1; AFNElJ/Iswp/Si2FN2sJkApaAbvO2KUXUidoGIom0DakLfUG5wJNpPmYdJ6A5H5kwHIlrJBszFQsDad0QZa99PAQ3jX6SMLE@freebsd.org X-Gm-Message-State: AOJu0YwB6bCw/JSLjBp+0rld//mDdLyusap5ZPl7CdQqJFQeaKOXVzF9 fZFK/zu2I+mRJZ+EPPDDmJ8Xs8v017/M3QdQLMzu45hMPQI2fnmHuPfsSp/XzJZs X-Gm-Gg: AeBDieuT8wbCOdwUdQN3apo60k5pIO21zjzQ9jj4JiT50naH4riW/tMI4zRlvtd3zAW uvLEmB0DwdYl2r0QkWU52EstJAHtV9OaHMhTxNc7EKZNzvoiHSt1rjcrrjZ/X/8T6RfV8SJsteX JW8EnV88tLYFbgZQUCzb24+d37dISqifNikG//rqyN9kF3jJzu7TB5E3Y4mQTMq13Q2mUell0U9 fvqfeIZejdwR1M3355dEHAkU0517u7bfhiTWY2ubVkHa+sxwEwmbZIAX6ZXIw2NY4fvRIVrSB7x wZGLw1SbFXa+s7M+T2V47Twm872Z+XwCWTTshdv4hLVgMdpOiiorU4uO0FHj2HwLzWLi5u0zc1J z1q2BeFpibjbvWlRncbEFV5GyWpL1uvFxCuEmtqO4agY9qVEVQkL70fCPw9NHy5atD393sSN2aR UAHhIqSNrdzQAIpBlRPRG5cUk8PJlS4jZNFEsVWb3AUm0aInJ+1U5Kma2s2BMJ6JqL002zI3k= X-Received: by 2002:a17:902:cecc:b0:2b4:6562:642b with SMTP id d9443c01a7336-2b97c4bab60mr45824955ad.35.1777405311595; Tue, 28 Apr 2026 12:41:51 -0700 (PDT) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com. [209.85.215.169]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b98893f132sm281035ad.49.2026.04.28.12.41.51 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Apr 2026 12:41:51 -0700 (PDT) Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-c76b994f7a8so4775289a12.3 for ; Tue, 28 Apr 2026 12:41:51 -0700 (PDT) X-Forwarded-Encrypted: i=1; AFNElJ+jMnShFSu+0Rwfl/jFvHtcwyOkE9TvlCzMOhKhbxB/cokTKypg5nQ9aQKpkUlDOyeLHHLCHCHAOMGqrOXLi4JdSWpW@freebsd.org X-Received: by 2002:a05:6a20:748e:b0:3a2:d68d:9e7e with SMTP id adf61e73a8af0-3a39c2b8f28mr5472700637.41.1777405311051; Tue, 28 Apr 2026 12:41:51 -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: <69f0ea0c.19f57.339fcc06@gitrepo.freebsd.org> <20260428180947.83C47130@slippy.cwsent.com> In-Reply-To: From: Chuck Tuffli Date: Tue, 28 Apr 2026 12:41:39 -0700 X-Gmail-Original-Message-ID: X-Gm-Features: AVHnY4LdTXlL6AQ1WLIDRlvoguHzd8qJairfqeAcXr3Bd3g3ksMP8xOTsGt7pq0 Message-ID: Subject: Re: git: 68e5b71517e9 - main - Vendor import of smart at 1.0.2 To: Jessica Clarke Cc: Robert Clausecker , Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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] X-Rspamd-Queue-Id: 4g4rRP5TZ3z48mD X-Spamd-Bar: ---- On Tue, Apr 28, 2026 at 11:40=E2=80=AFAM Jessica Clarke wrote: > > On 28 Apr 2026, at 19:34, Robert Clausecker wrote: > > > Hi Chuck, > > > > Am Tue, Apr 28, 2026 at 11:21:26AM -0700 schrieb Chuck Tuffli: > >> On Tue, Apr 28, 2026 at 11:09=E2=80=AFAM Cy Schubert wrote: > >>> > >>> In message <69f0ea0c.19f57.339fcc06@gitrepo.freebsd.org>, Chuck Tuffl= i > >>> writes: > >>>> The branch main has been updated by chuck: > >>>> > >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D68e5b71517e947b4e3f34= 9c970af362b > >>>> 47b45f27 > >>>> > >>>> commit 68e5b71517e947b4e3f349c970af362b47b45f27 > >>>> Author: Chuck Tuffli > >>>> AuthorDate: 2026-04-28 16:55:50 +0000 > >>>> Commit: Chuck Tuffli > >>>> CommitDate: 2026-04-28 17:08:27 +0000 > >>>> > >>>> Vendor import of smart at 1.0.2 > >>>> > >>>> smart/diskhealth is a command line application to monitor disk he= alth > >>>> from a storage device via SMART. > >>>> > >>>> Reviewed by: fuz, jrm > >>>> Relnotes: yes > >>>> Differential Revision: https://reviews.freebsd.org/D56638 > >>>> --- > >>>> contrib/smart/Changelog | 37 ++ > >>>> contrib/smart/LICENSE | 13 + > >>>> contrib/smart/Makefile | 26 + > >>>> contrib/smart/freebsd_dev.c | 828 +++++++++++++++++++++++++ > >>>> contrib/smart/libsmart.c | 1359 +++++++++++++++++++++++++++++++= ++++++++ > >>>> ++ > >>>> contrib/smart/libsmart.h | 174 ++++++ > >>>> contrib/smart/libsmart_desc.c | 158 +++++ > >>>> contrib/smart/libsmart_dev.h | 60 ++ > >>>> contrib/smart/libsmart_priv.h | 83 +++ > >>>> contrib/smart/smart.8 | 245 ++++++++ > >>>> contrib/smart/smart.c | 334 ++++++++++ > >>>> packages/Makefile | 1 + > >>>> packages/smart/Makefile | 4 + > >>>> packages/smart/smart.ucl | 30 + > >>>> usr.sbin/Makefile | 1 + > >>>> usr.sbin/smart/Makefile | 8 + > >>>> 16 files changed, 3361 insertions(+) > >>> > >>> Why are we doing vendor imports directly to contrib/? Is this a new > >>> procedure, do we not need to use the vendor branch anymore? > >> > >> Sorry, this is new territory for me, and I may have goofed. My > >> understanding was the upstream code lives in a vendor/* branch (which > >> I forgot to push) and the contents are copied to the contrib/* > >> directory and then committed. If this isn't the right thing to do, let > >> me know how to fix this. > > > > Your understanding is correct, though you are supposed to do a merge > > to tie the vendor branch and the change in the contrib directory > > together, making it clear which state of the vendor branch the contrib > > directory corresponds to. > > > > The best way to fix this is to revert your change and then to retry > > with a merge commit. > > The helpful link seemingly omitted from this thread so far: > > https://docs.freebsd.org/en/articles/committers-guide/index.html#vendor-i= mport-git Apologies for the goof :( Just to make sure I have this all correct, I will 1. Create a branch vendor/smart containing only the pieces from upstream that base needs and commit 2. git tag -a vendor/smart/1.0.2 -m "Tag smart at 1.0.2" 3. git push --follow-tags freebsd vendor/smart 4. git switch main 5. git subtree merge -P contrib/smart vendor/smart Here is where I'm fuzzy on what to do. Am I supposed to push this as-is or am I allowed to make changes? If I can make changes, is that via git commit --amend? Since this is a new import, what commit do the changes to packages/* and usr.sbin/* go? Their own commit or as a part of the merge? --chuck