From nobody Thu Jul 07 17:46:11 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 22D6E3E6AA7 for ; Thu, 7 Jul 2022 17:46:27 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vk1-xa32.google.com (mail-vk1-xa32.google.com [IPv6:2607:f8b0:4864:20::a32]) (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 4Lf3k70Yqzz3k4p for ; Thu, 7 Jul 2022 17:46:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vk1-xa32.google.com with SMTP id j26so9229390vki.12 for ; Thu, 07 Jul 2022 10:46:23 -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=jN03Ow2Ac4ka0R10ltuiSNoZKPescc7/MHysDqFdzBg=; b=SqPLEqFDo2X8CA1zY8UH3rLGdgMx62ra77zDYbAlp2oNzmXV/1UmruC6dAobHRNim5 FJD/Li+GkLRPQrSQtSSZXhsGzqkSThrqmejI7VmvSozPjKmJcNXWLli4fI2h9Hbh+314 Nr8TLPL6fB6KguIj7qRlprPlafjgU6+cbdvdcGubDFs7YcsLPZlXW5f87LhUpXAbjdVZ cXZYaKF+MdZRi1GqXP0zKqZ88i4y8Ey2w1uecRTPb2PABLQ6wGMEXeGnkNipx761iGbZ g5214Prm1SE8eUuWUp0fPA560V05v5TzsBn7v0XY4PbhopNCxf5VCwlY84hHVivq6g5V ktYw== 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=jN03Ow2Ac4ka0R10ltuiSNoZKPescc7/MHysDqFdzBg=; b=Lf2BUw5uMNj5fBrHD81NpARsyiJouHIhsh+ZT6cuNPVq76XUnVxuESr14egRAlbMLK feehbtoNSALO6L0AYfsOZhV1/iERHPiOY1oOLuy0CFei+KWMPOf1KJE43eQAMeHoBSk6 eOXxrW+Gkk6tUehR7KtFyDC0PgpHeRe7iU4SKkC44tP9lJkALCSwv7pdfghdzK5NAfsm Tn6uN8XgCsrdcTri7xw1hR+nPl5mdOdb7Lr4AecpgGzLNkfJghQingVfPvdE9mGSoAkP el/8n29mssY6ACPAQAgQ8vMSOe4hM82AgidZceSrpe+I8Z8tj4OjlCiJqVFlZx9flLzt //qw== X-Gm-Message-State: AJIora9kTHjxw/aM6/wyF1aWTS5Mv85tSxqQHhUpPRCIFL8CWCZtkhOy RqHGotdta0vfuzxpIJBHUQ4Eo9hTdOk+OJA7+ZbfGBDX6ks= X-Google-Smtp-Source: AGRyM1u0eHQCWF8vcaRGsMyTrLwqiYbq9BxKPQipGNfjtYaRoOLD8r+2AS7a/s30eJwA/wSGwzB5fqJF1pLzuINUybo= X-Received: by 2002:a1f:b451:0:b0:374:1253:af96 with SMTP id d78-20020a1fb451000000b003741253af96mr9329453vkf.21.1657215982216; Thu, 07 Jul 2022 10:46:22 -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 11:46:11 -0600 Message-ID: Subject: Re: buildkernel is broken To: Kyle Evans Cc: Steve Kargl , Ryan Stone , FreeBSD Current Content-Type: multipart/alternative; boundary="000000000000efcac805e33aa952" X-Rspamd-Queue-Id: 4Lf3k70Yqzz3k4p X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b=SqPLEqFD; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::a32) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.00 / 15.00]; NEURAL_HAM_SHORT(-1.00)[-1.000]; 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]; ARC_NA(0.00)[]; MLMMJ_DEST(0.00)[freebsd-current]; R_SPF_NA(0.00)[no SPF record]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::a32:from]; BLOCKLISTDE_FAIL(0.00)[2607:f8b0:4864:20::a32:server fail]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; RCPT_COUNT_THREE(0.00)[4]; 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)[troutmask.apl.washington.edu,gmail.com,freebsd.org] X-ThisMailContainsUnwantedMimeParts: N --000000000000efcac805e33aa952 Content-Type: text/plain; charset="UTF-8" On Thu, Jul 7, 2022 at 11:21 AM Kyle Evans wrote: > On Thu, Jul 7, 2022 at 10:01 AM Steve Kargl > wrote: > > > > On Thu, Jul 07, 2022 at 10:37:40AM -0600, Warner Losh wrote: > > > 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? > > > > > > > A cursory google search suggests that 'git fetch' > > works on repositories not single files. > > > > Right, the idea is that you `git fetch origin main` (or whatever your > remote is called rather than 'origin') then you can cherry-pick the > revision. fetch will grab the revision without merging it into the > current branch. > Indeed. a git fetch command will only update the remote/origin/upstream tags and such as well as fetching new revisions there. It won't affect any local branches as all until you explicitly merge them with 'git merge' or implicitly with a 'git pull'. Warner > > I did look at the diff associated with 37f604b49d4a. > > I am surprised that the commit that broke buildkernel > > for me was allowed to be committed. The fix in > > 37f604b49d4a seems rather questionable especially given > > that there is no comment about why the macro is expanded > > to a zero-trip loop. > > > > Thanks for the help. I'll just do a 'git pull' > > and start over with a buildworld. > > > > -- > > Steve > > > --000000000000efcac805e33aa952 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Jul 7, 2022 at 11:21 AM Kyle = Evans <kevans@freebsd.org> = wrote:
On Thu, J= ul 7, 2022 at 10:01 AM Steve Kargl
<s= gk@troutmask.apl.washington.edu> wrote:
>
> On Thu, Jul 07, 2022 at 10:37:40AM -0600, Warner Losh wrote:
> > 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?
> >
>
> A cursory google search suggests that 'git fetch'
> works on repositories not single files.
>

Right, the idea is that you `git fetch origin main` (or whatever your
remote is called rather than 'origin') then you can cherry-pick the=
revision. fetch will grab the revision without merging it into the
current branch.

Indeed. a git fetch com= mand will only update the remote/origin/upstream
tags and such as= well as fetching new revisions=C2=A0there. It won't affect any
local branches as all until you explicitly merge them with 'git merg= e' or
implicitly with a 'git pull'.

Warner
=C2=A0
> I did look at the diff associated with 37f604b49d4a.
> I am surprised that the commit that broke buildkernel
> for me was allowed to be committed.=C2=A0 The fix in
> 37f604b49d4a seems rather questionable especially given
> that there is no comment about why the macro is expanded
> to a zero-trip loop.
>
> Thanks for the help.=C2=A0 I'll just do a 'git pull'
> and start over with a buildworld.
>
> --
> Steve
>
--000000000000efcac805e33aa952--