From owner-freebsd-current@freebsd.org Mon Jun 3 15:07:36 2019 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75D3515B3DC9 for ; Mon, 3 Jun 2019 15:07:36 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org [IPv6:2001:1900:2254:206a::50:5]) by mx1.freebsd.org (Postfix) with ESMTP id C8F8584CA1 for ; Mon, 3 Jun 2019 15:07:35 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.ysv.freebsd.org (Postfix) id 8C55615B3DC7; Mon, 3 Jun 2019 15:07:35 +0000 (UTC) Delivered-To: current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7858D15B3DC6 for ; Mon, 3 Jun 2019 15:07:35 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [198.144.209.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AEC4F84C9F for ; Mon, 3 Jun 2019 15:07:34 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.15.2/8.15.2) with ESMTP id x53F7RCS018272; Mon, 3 Jun 2019 15:07:27 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.15.2/8.15.2/Submit) id x53F7R2C018271; Mon, 3 Jun 2019 08:07:27 -0700 (PDT) (envelope-from david) Date: Mon, 3 Jun 2019 08:07:27 -0700 From: David Wolfskill To: Warner Losh Cc: Andreas Nilsson , FreeBSD Current Subject: Re: Post-installworld mergemaster breakage r348504 -> r348529? Message-ID: <20190603150727.GK1170@albert.catwhisker.org> Mail-Followup-To: David Wolfskill , Warner Losh , Andreas Nilsson , FreeBSD Current References: <20190603110454.GH1170@albert.catwhisker.org> <20190603112743.GI1170@albert.catwhisker.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="XK4NhNJ9GVfup2vH" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.12.0 (2019-05-25) X-Rspamd-Queue-Id: AEC4F84C9F X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.984,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 03 Jun 2019 15:07:36 -0000 --XK4NhNJ9GVfup2vH Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 03, 2019 at 08:15:18AM -0600, Warner Losh wrote: > I just committed this as a stop-gap fix. >=20 > Warner > .... Cool. I encountered the issue on my build box -- laptop was still busy with other stuff. Later, when the laptop was ready for the same update to head, I applied the change proactively, and things Just Worked. :-) Peace, david --=20 David H. Wolfskill david@catwhisker.org "One of the things I learned is it=E2=80=99s not about the political view, = it=E2=80=99s about=20 the kind of person they are.=E2=80=9D -- political reporter Dave Bryan (ret= ired) See http://www.catwhisker.org/~david/publickey.gpg for my public key. --XK4NhNJ9GVfup2vH Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAlz1N69fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcnFiggAlzxouMl7RiBsLMWg1IcjXnkoBeGviSF/FwFvGz5YPNAD5yGN89xKlWl2 9//cic9BwIIP6Ery+ukHYAavueo7Bj53AUNL2UcjFCItykg6A6IaV08BP/1+U+xt 00poDUhTo7lXbcoPMyAU+SUBiqiLWWn+Yp6yKh004A4us1XE4Z6i4AY/9ZZbfOnu H4kjSzgxnpuSwXojXnpSuivAoGT1JCV4cHj0YH+kCE5OdPUpbleSJUsuM1/szg0s ANbhE5kITVYdopSgMK+20w9ifOB5wsI1Sa88JCMawE1MHe/hK8/uBnuJkDVZ647h KfeqUsYncJLoOkATsUNGPTN9cV6BXg== =4+87 -----END PGP SIGNATURE----- --XK4NhNJ9GVfup2vH--