From nobody Wed Feb 22 20:53:02 2023 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 4PMSzY23M9z3sBTm for ; Wed, 22 Feb 2023 20:53:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PMSzY062mz3Khx for ; Wed, 22 Feb 2023 20:53:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x536.google.com with SMTP id h16so35838403edz.10 for ; Wed, 22 Feb 2023 12:53:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=3f4ARSBgEmnSwizap2H1K+k17ODgaw1BUgNw58ZsFYo=; b=XoGcM65uR6Y7YmRz3mZjnYf2s8fnEEcb4ylCnXP5d40f5hU/HzBBYsmUh86WoicDpT kvnFiPX2nK3lwDoFn5aQootAw+MXCy54eYYZiX2ekGHZOUnvZnveEX+wfEoN3nSK9jf6 nTF+WQHhLSH8NEc8gmbdI1E9VTq2Kzkfk2XPCZewcKhsn3/nAi/PYPtmhJ9WmEPe5yXD 6cPlhFH15WDa3KFyk1BckzPh8lzfqgVAGBAp9aHRStNKemguxxNaQkbgUCMhvu1TQrRz Z0jVnUKcO9ojMzpKe1dED+hTin58sPgcbwoMbWZHJsjWbWX/YB8jnI1uUV2qAYMdoKoh 5LDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=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=3f4ARSBgEmnSwizap2H1K+k17ODgaw1BUgNw58ZsFYo=; b=4wceh/7V9hnN/hPjr9soIVSlsP/HjssQ2hY6mRHU5tP/abLjhV00j0syroJcohJQ/4 vEvpr3/hK52naI3arfx7KCikAFlFXkj25vZji9i+9NZIgLFku870SVzl+VtDdzMhyUe4 JEcZSKlS/icMEcBSyv4m+ev8i7n9E8Uuy8V7BuSVPji+tje3kAiyOI9hAH6prtzGnCQu kIWi9tnlG1E6zdbPImiKUjgfsRglYBp+YIJDQDyvrf+2Bg+aeJ2mrAb9EgLoeiNCNAzx DOvdXwqQnBhOdzYQTqs2C/CBx82GBdUixrV7s1vEc/OyGCbj5ogRV1SLgsInBio0Z5tO VTYQ== X-Gm-Message-State: AO0yUKUKK5PhncXTDlIF1W/1ELG5FHtdqc8BNcxISbWt/ogQgV3dyXTX CwadlrT1w9FmyL1S9lPCBqp7GWlWXjTuGlawl/uhKg== X-Google-Smtp-Source: AK7set9fV3RrB1+1+RRALDNwTYJ+jXyjPV8WV16f831lfZHM2qxT7BkHFsdEaefpHRabIR97PjuT+0fYx5lcm8/1HXA= X-Received: by 2002:a17:906:119b:b0:8d1:57cf:ef3c with SMTP id n27-20020a170906119b00b008d157cfef3cmr5471174eja.2.1677099191537; Wed, 22 Feb 2023 12:53:11 -0800 (PST) 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202302220431.31M4VgwO065942@gitrepo.freebsd.org> <20230222043708.GQ95670@funkthat.com> <20230222070900.GR95670@funkthat.com> In-Reply-To: <20230222070900.GR95670@funkthat.com> From: Warner Losh Date: Wed, 22 Feb 2023 13:53:02 -0700 Message-ID: Subject: Re: git: ee97f198b42d - main - Support SMBIOS v3 for 64-bit entry systems To: John-Mark Gurney , Warner Losh , src-committers , "" , dev-commits-src-main@freebsd.org, Warner Losh Content-Type: multipart/alternative; boundary="00000000000090a59a05f550156f" X-Rspamd-Queue-Id: 4PMSzY062mz3Khx X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --00000000000090a59a05f550156f Content-Type: text/plain; charset="UTF-8" On Wed, Feb 22, 2023 at 12:09 AM John-Mark Gurney wrote: > Warner Losh wrote this message on Tue, Feb 21, 2023 at 22:04 -0700: > > On Tue, Feb 21, 2023, 9:37 PM John-Mark Gurney wrote: > > > > > John-Mark Gurney wrote this message on Wed, Feb 22, 2023 at 04:31 > +0000: > > > > The branch main has been updated by jmg: > > > > > > > > URL: > > > > https://cgit.FreeBSD.org/src/commit/?id=ee97f198b42d50437f87aa4111d478eca2a5be16 > > > > > > > > commit ee97f198b42d50437f87aa4111d478eca2a5be16 > > > > Author: John-Mark Gurney > > > > AuthorDate: 2023-02-22 02:27:37 +0000 > > > > Commit: John-Mark Gurney > > > > CommitDate: 2023-02-22 04:10:12 +0000 > > > > > > > > Support SMBIOS v3 for 64-bit entry systems > > > > > > > > Summary: > > > > Under QEMU on arm64 systems, the smbios table is above 4GB > > > > requiring a 64-bit address to access. > > > > > > > > Reviewers: manu > > > > > > > > Subscribers: imp, bcran, dab > > > > > > > > Differential Revision: https://reviews.freebsd.org/D38721 > > > > > > Sorry, but this commit message is incorrect, it should be > > > Reviewed by: imp > > > > > > and the Reviewers and subscriber lines dropped. > > > > > > I had editted the file, but due to wonkyness w/ git, that amended > > > commit got lost and the original one was submitted instead. > > > > > > Not sure if there is a way to fix it though. > > > > > > > You can't fix it. But it's not a huge deal... > > Yeah, I figured, and the info is there in the review... > > > How'd you land this? with 'arc' or 'git arc' Since I've started using the > > latter, I've not had issues... Raw 'arc' seems to have an extra layer of > > wonkiness... > > I did the dev on another box than the one that I can commit from.. So it > took some git push/fetch to get it onto the correct box... > > I had amended the commit, but then I got a bit confused about how to push > from the branch to main, and so I checked out the branch again that didn't > the amended commit and then pushed it: > git push origin HEAD:main > > It just teaches me to make sure I amend the commits sooner rather than > later.. > Indeed. You can also push a branch with the above syntax without having it checked it, which I do from time to time when I 'copy branches' from one repo to another for pushing upstream. Though it wouldn't help with this situation... Warner --00000000000090a59a05f550156f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Feb 22, 2023 at 12:09 AM John= -Mark Gurney <jmg@funkthat.com&g= t; wrote:
Warner= Losh wrote this message on Tue, Feb 21, 2023 at 22:04 -0700:
> On Tue, Feb 21, 2023, 9:37 PM John-Mark Gurney <jmg@funkthat.com> wrote:
>
> > John-Mark Gurney wrote this message on Wed, Feb 22, 2023 at 04:31= +0000:
> > > The branch main has been updated by jmg:
> > >
> > > URL:
> > https://= cgit.FreeBSD.org/src/commit/?id=3Dee97f198b42d50437f87aa4111d478eca2a5be16<= /a>
> > >
> > > commit ee97f198b42d50437f87aa4111d478eca2a5be16
> > > Author:=C2=A0 =C2=A0 =C2=A0John-Mark Gurney <jmg@FreeBSD.= org>
> > > AuthorDate: 2023-02-22 02:27:37 +0000
> > > Commit:=C2=A0 =C2=A0 =C2=A0John-Mark Gurney <jmg@FreeBSD.= org>
> > > CommitDate: 2023-02-22 04:10:12 +0000
> > >
> > >=C2=A0 =C2=A0 =C2=A0Support SMBIOS v3 for 64-bit entry system= s
> > >
> > >=C2=A0 =C2=A0 =C2=A0Summary:
> > >=C2=A0 =C2=A0 =C2=A0Under QEMU on arm64 systems, the smbios t= able is above 4GB
> > >=C2=A0 =C2=A0 =C2=A0requiring a 64-bit address to access.
> > >
> > >=C2=A0 =C2=A0 =C2=A0Reviewers: manu
> > >
> > >=C2=A0 =C2=A0 =C2=A0Subscribers: imp, bcran, dab
> > >
> > >=C2=A0 =C2=A0 =C2=A0Differential Revision: https://r= eviews.freebsd.org/D38721
> >
> > Sorry, but this commit message is incorrect, it should be
> > Reviewed by: imp
> >
> > and the Reviewers and subscriber lines dropped.
> >
> > I had editted the file, but due to wonkyness w/ git, that amended=
> > commit got lost and the original one was submitted instead.
> >
> > Not sure if there is a way to fix it though.
> >
>
> You can't fix it. But it's not a huge deal...

Yeah, I figured, and the info is there in the review...

> How'd you land this? with 'arc' or 'git arc' Since= I've started using the
> latter, I've not had issues... Raw 'arc' seems to have an = extra layer of
> wonkiness...

I did the dev on another box than the one that I can commit from..=C2=A0 So= it
took some git push/fetch to get it onto the correct box...

I had amended the commit, but then I got a bit confused about how to push from the branch to main, and so I checked out the branch again that didn= 9;t
the amended commit and then pushed it:
git push origin HEAD:main

It just teaches me to make sure I amend the commits sooner rather than
later..

Indeed. You can also push a bra= nch with the above syntax without
having it checked it, which I d= o from time to time when I 'copy branches'
from one repo = to another for pushing upstream. Though it wouldn't
help with= this situation...

Warner
--00000000000090a59a05f550156f--