Re: git: ee97f198b42d - main - Support SMBIOS v3 for 64-bit entry systems

On Wed, Feb 22, 2023 at 12:09 AM John-Mark Gurney <jmg@funkthat.com> 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=ee97f198b42d50437f87aa4111d478eca2a5be16
> > > >
> > > > commit ee97f198b42d50437f87aa4111d478eca2a5be16
> > > > Author:     John-Mark Gurney <jmg@FreeBSD.org>
> > > > AuthorDate: 2023-02-22 02:27:37 +0000
> > > > Commit:     John-Mark Gurney <jmg@FreeBSD.org>
> > > > 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