From owner-freebsd-current@freebsd.org Wed Mar 3 00:22:24 2021 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9ACE8556094 for ; Wed, 3 Mar 2021 00:22:24 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dqvp72C61z3qqP for ; Wed, 3 Mar 2021 00:22:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x829.google.com with SMTP id o1so11849315qta.13 for ; Tue, 02 Mar 2021 16:22:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=40T3/ixHPG6UHcquZlqNNsZzy7O3yC+UTcXRxYD8OnE=; b=cfa3qpw/19aLOiN58Z9TUIQOhPd+yubUtPdpFf6jGcHNM21pfGVVFEJ7Im0VuPQ/A3 ltV3mA2554KjdF55IJqZinb9mSSWi802nX+wyHQ7nhrLhtqnOng+gibTYjAiYQ/WENE1 YEVU7beqFh7IqDit7lUcJy++I+KNVai+OaDdEjyjRe6zxOi11SaBBsoGkK4lF+Yyjbzy GYZIbIB05RLf0a+FtoTJ08/ZvimIywTaMoBoA0FEkYHNSZHLbekney1lBTgse398D4kO DD4PTHAFqASxxcUYZumRhk8EVgHaBWP8GZT2OMv6yOxJZjyDzXBHYTsUyVAqgFRCMw2y a0yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=40T3/ixHPG6UHcquZlqNNsZzy7O3yC+UTcXRxYD8OnE=; b=U80CJEGvF80nN3Uf/tqAu8IXDB6/J96HiwE12AxFV7PjHRzESkdpGo3qltYYcUkqmK aCN3Pn27cP6jIVCewVFVRskO5ecEZFM1iUqAxFqkHhShINdoCcf0tYrc95ecp8ReC2qy 1h22J+FASvlX7Hqhg1vDowmBCWKYEhAbhxGXixFOClo4QOPeC4s8DEHpEA0Kk+P5rSaE 5cOnctWtNTsX42RUylxxgA2N6fdIUj/VLNopIq0uUrJ9XeJQaAmNstyT8QNm3YpoAXir 2cJLGVSIZMf1eUGoNrEVpMD99gxawfAUpuLmDh6CwID/vV00IGqn8zIFUMpkhyj0qV4H TYBA== X-Gm-Message-State: AOAM530JLr3TqFnkXC2nKgSx9NwQmPxTYBxdqEcl/57zNjLBEhKF9uF2 lA/UbllrOfmfyd1rEu4UjWJOcQq4DljgaT+ImCI9CnHAZkDg/w== X-Google-Smtp-Source: ABdhPJxgTm+FSgNkQ1M5O13+Wj5j6/ZGjQwLHigSOFOLk/3Kaj0gVyAq6YXDTCorkE1C7LKHJYYvZedv/teba++TN50= X-Received: by 2002:a05:622a:303:: with SMTP id q3mr19844060qtw.235.1614730942422; Tue, 02 Mar 2021 16:22:22 -0800 (PST) MIME-Version: 1.0 References: <20210302161823.GA56341@www.zefox.net> <20210302174606.GA56521@www.zefox.net> In-Reply-To: <20210302174606.GA56521@www.zefox.net> From: Warner Losh Date: Tue, 2 Mar 2021 17:22:11 -0700 Message-ID: Subject: Re: URL for stable/13 To: bob prohaska Cc: FreeBSD Current X-Rspamd-Queue-Id: 4Dqvp72C61z3qqP X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=cfa3qpw/; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::829) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; MAILMAN_DEST(0.00)[freebsd-current]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::829:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::829:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::829:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Mar 2021 00:22:24 -0000 On Tue, Mar 2, 2021 at 10:46 AM bob prohaska wrote: > On Tue, Mar 02, 2021 at 09:46:11AM -0700, Warner Losh wrote: > > On Tue, Mar 2, 2021 at 9:18 AM bob prohaska wrote: > > > > > A while back I obtained a buildable source tree for stable/13 > > > but it hasn't been updated in the last few days. Running > > > > It would help if you asked a question. > > > > Apparently I didn't understand the correct question to ask. > 8-) > > When set up I configured git to use -ff only and simply used > git pull . to update, which seemed to work until a few days ago. > > > > If you'd like to know how to update now that you have this tree, I'd > > suggest 'git pull --rebase' or 'git pull --ff-only' > > > > Now it seems an explicit git pull --ff-only is required. > It just pulled down a substantial crop of updates. Now > to see if buildworld succeeds.... That'll take a while. > git config merge.ff only Toss a '--global' in there after the 'config' for all repos. Warner > > If it's some other question, I'm happy to help with that. > > > > You already have, and I didn't even ask the right question... > > Thank you! > bob prohaska > > >