Date: Wed, 22 Feb 2023 13:53:02 -0700 From: Warner Losh <imp@bsdimp.com> To: John-Mark Gurney <jmg@funkthat.com>, Warner Losh <imp@bsdimp.com>, src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, dev-commits-src-main@freebsd.org, Warner Losh <imp@freebsd.org> Subject: Re: git: ee97f198b42d - main - Support SMBIOS v3 for 64-bit entry systems Message-ID: <CANCZdfoo2ufV8rq6ah36KJ_AGGEbVwCrAH7OK0GH6FSjQaqnZg@mail.gmail.com> In-Reply-To: <20230222070900.GR95670@funkthat.com> References: <202302220431.31M4VgwO065942@gitrepo.freebsd.org> <20230222043708.GQ95670@funkthat.com> <CANCZdfrr6wJJokOj83A9Wispm%2BmuedMAayck=zNAnp74b-Knew@mail.gmail.com> <20230222070900.GR95670@funkthat.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--00000000000090a59a05f550156f Content-Type: text/plain; charset="UTF-8" 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 --00000000000090a59a05f550156f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">= <div dir=3D"ltr" class=3D"gmail_attr">On Wed, Feb 22, 2023 at 12:09 AM John= -Mark Gurney <<a href=3D"mailto:jmg@funkthat.com">jmg@funkthat.com</a>&g= t; wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0p= x 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Warner= Losh wrote this message on Tue, Feb 21, 2023 at 22:04 -0700:<br> > On Tue, Feb 21, 2023, 9:37 PM John-Mark Gurney <<a href=3D"mailto:j= mg@funkthat.com" target=3D"_blank">jmg@funkthat.com</a>> wrote:<br> > <br> > > John-Mark Gurney wrote this message on Wed, Feb 22, 2023 at 04:31= +0000:<br> > > > The branch main has been updated by jmg:<br> > > ><br> > > > URL:<br> > > <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3Dee97f198b42d= 50437f87aa4111d478eca2a5be16" rel=3D"noreferrer" target=3D"_blank">https://= cgit.FreeBSD.org/src/commit/?id=3Dee97f198b42d50437f87aa4111d478eca2a5be16<= /a><br> > > ><br> > > > commit ee97f198b42d50437f87aa4111d478eca2a5be16<br> > > > Author:=C2=A0 =C2=A0 =C2=A0John-Mark Gurney <jmg@FreeBSD.= org><br> > > > AuthorDate: 2023-02-22 02:27:37 +0000<br> > > > Commit:=C2=A0 =C2=A0 =C2=A0John-Mark Gurney <jmg@FreeBSD.= org><br> > > > CommitDate: 2023-02-22 04:10:12 +0000<br> > > ><br> > > >=C2=A0 =C2=A0 =C2=A0Support SMBIOS v3 for 64-bit entry system= s<br> > > ><br> > > >=C2=A0 =C2=A0 =C2=A0Summary:<br> > > >=C2=A0 =C2=A0 =C2=A0Under QEMU on arm64 systems, the smbios t= able is above 4GB<br> > > >=C2=A0 =C2=A0 =C2=A0requiring a 64-bit address to access.<br> > > ><br> > > >=C2=A0 =C2=A0 =C2=A0Reviewers: manu<br> > > ><br> > > >=C2=A0 =C2=A0 =C2=A0Subscribers: imp, bcran, dab<br> > > ><br> > > >=C2=A0 =C2=A0 =C2=A0Differential Revision: <a href=3D"https:/= /reviews.freebsd.org/D38721" rel=3D"noreferrer" target=3D"_blank">https://r= eviews.freebsd.org/D38721</a><br> > ><br> > > Sorry, but this commit message is incorrect, it should be<br> > > Reviewed by: imp<br> > ><br> > > and the Reviewers and subscriber lines dropped.<br> > ><br> > > I had editted the file, but due to wonkyness w/ git, that amended= <br> > > commit got lost and the original one was submitted instead.<br> > ><br> > > Not sure if there is a way to fix it though.<br> > ><br> > <br> > You can't fix it. But it's not a huge deal...<br> <br> Yeah, I figured, and the info is there in the review...<br> <br> > How'd you land this? with 'arc' or 'git arc' Since= I've started using the<br> > latter, I've not had issues... Raw 'arc' seems to have an = extra layer of<br> > wonkiness...<br> <br> I did the dev on another box than the one that I can commit from..=C2=A0 So= it<br> took some git push/fetch to get it onto the correct box...<br> <br> I had amended the commit, but then I got a bit confused about how to push<b= r> from the branch to main, and so I checked out the branch again that didn= 9;t<br> the amended commit and then pushed it:<br> git push origin HEAD:main<br> <br> It just teaches me to make sure I amend the commits sooner rather than<br> later..<br></blockquote><div><br></div><div>Indeed. You can also push a bra= nch with the above syntax without</div><div>having it checked it, which I d= o from time to time when I 'copy branches'</div><div>from one repo = to another for pushing upstream. Though it wouldn't</div><div>help with= this situation...</div><div><br></div><div>Warner<br></div></div></div> --00000000000090a59a05f550156f--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfoo2ufV8rq6ah36KJ_AGGEbVwCrAH7OK0GH6FSjQaqnZg>