Date: Tue, 10 Jun 2025 21:12:14 -0700 From: Kevin Oberman <rkoberman@gmail.com> To: Brooks Davis <brooks@freebsd.org> Cc: FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: Bisecting issue in head Message-ID: <CAN6yY1vQeYH1ONzndaHW5JMjN6NsSPz9KQGKbNV3eb21Lu6D9g@mail.gmail.com> In-Reply-To: <aEigsgy-m7DiR3Ps@spindle.one-eyed-alien.net> References: <CAN6yY1uMV4rYWG9Dx2vCpBWp2wK_RqGhSPP=Ho74h9fE3mMJJg@mail.gmail.com> <aEigsgy-m7DiR3Ps@spindle.one-eyed-alien.net>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] Thanks, Brooks! That was the issue. I did manatee to mess up the bisection, so I am back to near my original start, I do have a more recent good to start with. I spent too many years with old-fashioned SVN and CVS and forgot how easy it is to not only branch, but merge with git. Thanks again! On Tue, Jun 10, 2025 at 2:16 PM Brooks Davis <brooks@freebsd.org> wrote: > On Tue, Jun 10, 2025 at 01:58:13PM -0700, Kevin Oberman wrote: > > I probably just don't understand something about the git repo, but I am > > having no luck bisecting the kernel after updating 3 days ago to a kernel > > that crashed at boot. > > > > # git bisect start > > # git bisect good 99976934274d > > # git bisect bad 2542189532b3 > > # make -j12 kernel > > # shutdown -r now > > PANIC and boot kernel.old (9976934274d) > > # git bisect bad > > /usr/src updates to 1d482ca6e37b9d34ccd3c7d > > > > Can someone explain what happened? How can any /usr/src hash provide a > > /usr/src lacking Makefile? How can I bisect any further? > > I suspect you're probably bisecting across a merge commit. If so, you > need to use the --first-parent argument to start to avoid taking right > hand side which is off in the vendor tree and not a valid FreeBSD source > tree. > > -- Brooks > -- Kevin Oberman, Part time kid herder and retired Network Engineer E-mail: rkoberman@gmail.com PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683 [-- Attachment #2 --] <div dir="ltr"><div class="gmail_default" style="font-family:tahoma,sans-serif;font-size:small">Thanks, Brooks! That was the issue. I did manatee to mess up the bisection, so I am back to near my original start, I do have a more recent good to start with.</div><div class="gmail_default" style="font-family:tahoma,sans-serif;font-size:small">I spent too many years with old-fashioned <span class="gmail-Lm gmail-ng gmail-Vt">SVN and CVS and forgot how easy it is to not only branch, but merge with git.</span></div><div class="gmail_default" style="font-family:tahoma,sans-serif;font-size:small"><span class="gmail-Lm gmail-ng gmail-Vt"><br></span></div><div class="gmail_default" style="font-family:tahoma,sans-serif;font-size:small"><span class="gmail-Lm gmail-ng gmail-Vt">Thanks again!</span></div></div><br><div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">On Tue, Jun 10, 2025 at 2:16 PM Brooks Davis <<a href="mailto:brooks@freebsd.org">brooks@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Tue, Jun 10, 2025 at 01:58:13PM -0700, Kevin Oberman wrote:<br> > I probably just don't understand something about the git repo, but I am<br> > having no luck bisecting the kernel after updating 3 days ago to a kernel<br> > that crashed at boot.<br> > <br> > # git bisect start<br> > # git bisect good 99976934274d<br> > # git bisect bad 2542189532b3<br> > # make -j12 kernel<br> > # shutdown -r now<br> > PANIC and boot kernel.old (9976934274d)<br> > # git bisect bad<br> > /usr/src updates to 1d482ca6e37b9d34ccd3c7d<br> > <br> > Can someone explain what happened? How can any /usr/src hash provide a<br> > /usr/src lacking Makefile? How can I bisect any further?<br> <br> I suspect you're probably bisecting across a merge commit. If so, you<br> need to use the --first-parent argument to start to avoid taking right<br> hand side which is off in the vendor tree and not a valid FreeBSD source<br> tree.<br> <br> -- Brooks<br> </blockquote></div><div><br clear="all"></div><br><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr">Kevin Oberman, Part time kid herder and retired Network Engineer<br>E-mail: <a href="mailto:rkoberman@gmail.com" target="_blank">rkoberman@gmail.com</a><br></div><div>PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683</div></div></div></div></div></div></div></div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAN6yY1vQeYH1ONzndaHW5JMjN6NsSPz9KQGKbNV3eb21Lu6D9g>