Date: Thu, 7 Jul 2022 10:37:40 -0600 From: Warner Losh <imp@bsdimp.com> To: Steve Kargl <sgk@troutmask.apl.washington.edu> Cc: Ryan Stone <rysto32@gmail.com>, FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: buildkernel is broken Message-ID: <CANCZdfoA2OGPOMT%2BeD4cjDnQ5DvYeG1Z2iXv-okDB3o_KCSjng@mail.gmail.com> In-Reply-To: <YscLgscTJlp6I4gf@troutmask.apl.washington.edu> References: <YsZptHF8tSttpTVy@troutmask.apl.washington.edu> <CAFMmRNz_FjszHNx92vbV9wezBHwT222w2PKO9WwN1zpWciRo5A@mail.gmail.com> <YsbtBZwfBMmltllg@troutmask.apl.washington.edu> <CAFMmRNyWYGD1UoyqMvTnyCnytKFrH9rPcM01Q2YMxhOQkWNd=A@mail.gmail.com> <Ysbyl28nKKlr5Kr2@troutmask.apl.washington.edu> <CAFMmRNyCDzMAcR6dfUAo53399YyaB%2B70ME20oBnOdLAqT-SBEQ@mail.gmail.com> <YscLgscTJlp6I4gf@troutmask.apl.washington.edu>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Thu, Jul 7, 2022 at 10:37 AM Steve Kargl < sgk@troutmask.apl.washington.edu> wrote: > Thanks, but > > root[216] git cherry-pick -n 37f604b49d4a > fatal: bad revision '37f604b49d4a' > root[217] pwd > /usr/src git fetch maybe? Warner > -- > steve > > On Thu, Jul 07, 2022 at 11:24:47AM -0400, Ryan Stone wrote: > > You could "git cherry-pick -n 37f604b49d4a; git restore --unstaged > > sys/net/vnet.h" to apply the fix to your local tree without committing > > it or leaving it staged for commit. > > > > On Thu, Jul 7, 2022 at 10:50 AM Steve Kargl > > <sgk@troutmask.apl.washington.edu> wrote: > > > > > > On Thu, Jul 07, 2022 at 10:38:43AM -0400, Ryan Stone wrote: > > > > Okay, update your tree and it should be fixed then. > > > > > > Is it possible to pull just that fix? I spent part of > > > yesterday building world, and contrary to popular belief, > > > not all hardware contain a 32-core uber-fast ryzen cpu. > > > > > > Can people please test their simple changes prior to > > > committing? > > > > > > -- > > > Steve > > -- > Steve > > [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Jul 7, 2022 at 10:37 AM Steve Kargl <<a href="mailto:sgk@troutmask.apl.washington.edu">sgk@troutmask.apl.washington.edu</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">Thanks, but<br> <br> root[216] git cherry-pick -n 37f604b49d4a<br> fatal: bad revision '37f604b49d4a'<br> root[217] pwd<br> /usr/src</blockquote><div><br></div><div>git fetch maybe?</div><div><br></div><div>Warner</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> </blockquote><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> -- <br> steve<br> <br> On Thu, Jul 07, 2022 at 11:24:47AM -0400, Ryan Stone wrote:<br> > You could "git cherry-pick -n 37f604b49d4a; git restore --unstaged<br> > sys/net/vnet.h" to apply the fix to your local tree without committing<br> > it or leaving it staged for commit.<br> > <br> > On Thu, Jul 7, 2022 at 10:50 AM Steve Kargl<br> > <<a href="mailto:sgk@troutmask.apl.washington.edu" target="_blank">sgk@troutmask.apl.washington.edu</a>> wrote:<br> > ><br> > > On Thu, Jul 07, 2022 at 10:38:43AM -0400, Ryan Stone wrote:<br> > > > Okay, update your tree and it should be fixed then.<br> > ><br> > > Is it possible to pull just that fix? I spent part of<br> > > yesterday building world, and contrary to popular belief,<br> > > not all hardware contain a 32-core uber-fast ryzen cpu.<br> > ><br> > > Can people please test their simple changes prior to<br> > > committing?<br> > ><br> > > --<br> > > Steve<br> <br> -- <br> Steve<br> <br> </blockquote></div></div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfoA2OGPOMT%2BeD4cjDnQ5DvYeG1Z2iXv-okDB3o_KCSjng>