From nobody Thu Jul 07 16:37:40 2022 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B2FDF12D8D09 for ; Thu, 7 Jul 2022 16:37:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vs1-xe31.google.com (mail-vs1-xe31.google.com [IPv6:2607:f8b0:4864:20::e31]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lf2C371T6z3Vw6 for ; Thu, 7 Jul 2022 16:37:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vs1-xe31.google.com with SMTP id 185so7679640vse.6 for ; Thu, 07 Jul 2022 09:37:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=GpV4GEede4R8KdGf6t2GR7rU7AvPQ4AxcyYQ0++ZWms=; b=hyOG+4TmhxfhCYorsH63TEwNkWt0Wamm+z/tKHyQ95boVFufc2qHPi1weR91Kiy9qW eLJ8QKFyNAX8kbOc0COJziERH5P4ZSqersvYuCtijYPCt7RM7/jekc/6IztNcXNNALoa Dm8E4H69PVzC1QShG0SwK5s2ueqZYE0BHkIk6CmZlCowiFg/18o/qfqEhFYvjimLRIqp P0OmFuUdDDc9uHQUyZ5eQ/rBunAGTSoS4D/KAxwD+2l92AACoP+UyVvi4IaW+jktX0Ji ph84xU4TF88EtRdoEgCdUcFiFKCKy1hV2TaSo73hDUXReK3xAaWXUq6N3M60ZZ9tU//o iDEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=GpV4GEede4R8KdGf6t2GR7rU7AvPQ4AxcyYQ0++ZWms=; b=zwS+NAumMcpUgIy7JlwUs2z7wq5GNuyljOxCnv/rinxkNYWn7pJgb7hLjNQI7UIwsm bPnPH36/9keut6RixBfvdyYRVCIeM4UOV79ug0ZwTkAKHzwk6MZiJvy3vJAyPolFl5RW QeFxx4D+xK7lMZrQl1bv4k6fkPrqlv0c4bWeC8f9BqFdgZ/1GVZzeqyqRXVUGuapwn0E 7RQbCWSPM5Y174ecO1bjVBpxsDg13D596sOAQyCw9YCDtNBx0sP23guWusdVjMBOK8qo X1VD4Y1P0G0FTQB6xKySdZwtMXnq/WidEWh3hLSAW4l7620uP5RJd0kwHJkrNbLLZ10F z9cQ== X-Gm-Message-State: AJIora94L3RpGlZXyZMmbKN8VmvjJBBuvtFU3kItNNh0PY/vj6Tx2hpw aNiffId5YojMx6fvFk0fEcUublIA2vNaPfi/B9jvAQ== X-Google-Smtp-Source: AGRyM1t2+uyivPzlwWY+rH8y8R/60JTa7CrjacDA2K+XKnWrzqIsRUA+g+9+RPhRzFfI4905YSkvNUBmsaTxuTaWIkY= X-Received: by 2002:a67:ec88:0:b0:357:83f:e0f3 with SMTP id h8-20020a67ec88000000b00357083fe0f3mr7294807vsp.76.1657211871218; Thu, 07 Jul 2022 09:37:51 -0700 (PDT) List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Thu, 7 Jul 2022 10:37:40 -0600 Message-ID: Subject: Re: buildkernel is broken To: Steve Kargl Cc: Ryan Stone , FreeBSD Current Content-Type: multipart/alternative; boundary="000000000000e6e43f05e339b41a" X-Rspamd-Queue-Id: 4Lf2C371T6z3Vw6 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b=hyOG+4Tm; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::e31) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.00 / 15.00]; NEURAL_HAM_SHORT(-1.00)[-0.995]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20210112.gappssmtp.com:s=20210112]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MLMMJ_DEST(0.00)[freebsd-current]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::e31:from]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; RCPT_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DMARC_NA(0.00)[bsdimp.com]; TO_DN_ALL(0.00)[]; FREEMAIL_CC(0.00)[gmail.com,freebsd.org] X-ThisMailContainsUnwantedMimeParts: N --000000000000e6e43f05e339b41a Content-Type: text/plain; charset="UTF-8" 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 > > 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 > > --000000000000e6e43f05e339b41a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Jul 7, 2022 at 10:37 AM Steve= Kargl <sgk@troutmas= k.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
=C2=A0
=C2=A0
--
steve

On Thu, Jul 07, 2022 at 11:24:47AM -0400, Ryan Stone wrote:
> You could "git cherry-pick -n 37f604b49d4a; git restore --unstage= d
> sys/net/vnet.h" to apply the fix to your local tree without commi= tting
> 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?=C2=A0 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

--000000000000e6e43f05e339b41a--