From nobody Thu Jul 07 15:30:05 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 6A1C512AD219 for ; Thu, 7 Jul 2022 15:30:18 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vs1-xe29.google.com (mail-vs1-xe29.google.com [IPv6:2607:f8b0:4864:20::e29]) (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 4Lf0j52N5Rz3LN6 for ; Thu, 7 Jul 2022 15:30:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vs1-xe29.google.com with SMTP id f68so3782626vsc.11 for ; Thu, 07 Jul 2022 08:30:17 -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=QNw8XdfPtKXkNE8+qNrTeVGa4QZ2HVL4Bc2M2JQhv7s=; b=sTUHHE/SmheKmDxrwVMyrjER3lJMl90LRO/hGMg6hiUMaoypc8uoXyPbcAgrlWAETl PcSa2XSHFngfr5pNUXn7Mrs3Q8bIS/wQ/x6DBdsEO03LG5Nhx0Q4kGMCXKJkeehDzRtQ svVNWjcdvdpuXRhTr+WMnp8Behfr9FDgimuNM9aD1R3ReYECWvHzVbip/20F2GYoJ8nd h1Wz77L/cRRY6bV62c/pw/2s0/23rgRScunRtvyJDDl67z7xAPOy5x3SM40Hfy7jgweA Vmox+QRrWzidOiWrIufbQyRWH/tfmMroLbF3kIjT1iEdfl/lXSrcVB5pY+ShFQ0Wco9w +tEQ== 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=QNw8XdfPtKXkNE8+qNrTeVGa4QZ2HVL4Bc2M2JQhv7s=; b=hO9Xem8GO20VrahGZffd9hFkFUV+xZFE6Xjotga81tSSDmgTD4PxtJI+pHctHxfUuG 1/kdUzsseF8n+iVPzZuNjQqC533uskfQcLgbd3aOLZYWR+uQhSWBEX5mzpoNd5k2Wc5r 4Lve7tap4/0Ac9rjE4GJuRT4/1kWVKA9UvvmnHUbMxMFsZ9NRwFEV75FrFwxuCA34c4q 64tzvir/oV2385LXcbTeUfsBXNYMq191eyokBt2hd7jZviZWmHBmlzTe2jWWc5da4Wld FXOtBEDsQghrrXhzi7wYp/4sjHQkOy+OWYKIKrEQBURH7Zs5H8sQwJZ0iSaVn5EvdxNf lANg== X-Gm-Message-State: AJIora/cO71gQ0wbD2I+uhtLgQK7Gzy/JrblZA1lKHliQmnIxwdEEHvV 6b8sTC3IJ1PSBZJPQr4r1glOS6sH/G34RtTascyQE7UoCn0= X-Google-Smtp-Source: AGRyM1sZ8OjvHlCZ1UmFxt89P/XA1IOvUavYWiBpSpd3ZY/US0weyhii71dpoxGnRgZ99ywjs2qpJ4JQr7R2KVAaMfs= X-Received: by 2002:a67:ec88:0:b0:357:83f:e0f3 with SMTP id h8-20020a67ec88000000b00357083fe0f3mr7008024vsp.76.1657207816216; Thu, 07 Jul 2022 08:30:16 -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 09:30:05 -0600 Message-ID: Subject: Re: buildkernel is broken To: Ryan Stone Cc: Steve Kargl , FreeBSD Current Content-Type: multipart/alternative; boundary="00000000000034780505e338c3b2" X-Rspamd-Queue-Id: 4Lf0j52N5Rz3LN6 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b="sTUHHE/S"; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::e29) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-0.97 / 15.00]; NEURAL_HAM_SHORT(-0.97)[-0.971]; 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]; FREEMAIL_TO(0.00)[gmail.com]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; 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::e29: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)[]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N --00000000000034780505e338c3b2 Content-Type: text/plain; charset="UTF-8" Or you could cherry-pick the fix. When you update git pull --rebase will automatically drop it when you rebase past that spot. Or if you have a branch, you can do the same to the branch and when you rebase past the fix, it will automatically drop. Warner On Thu, Jul 7, 2022 at 9:25 AM 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 > > --00000000000034780505e338c3b2 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Or you could cherry-pick the fix. When you update git= pull --rebase will automatically
drop it when you rebase past th= at spot. Or if you have a branch, you can do the same
to the bran= ch and when you rebase past the fix, it will automatically drop.
=
Warner

On Thu, Jul 7, 2022 at 9:25 AM Ryan Stone <rysto32@gmail.com> wrote:
You could "git cherry-p= ick -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
<s= gk@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

--00000000000034780505e338c3b2--