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 <bro...@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: rkober...@gmail.com
PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683

Reply via email to