From nobody Sun Jan 28 16:28:05 2024 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 4TNH185Rqmz58sY1 for ; Sun, 28 Jan 2024 16:28:28 +0000 (UTC) (envelope-from void@f-m.fm) Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4TNH182JVJz4JhC for ; Sun, 28 Jan 2024 16:28:28 +0000 (UTC) (envelope-from void@f-m.fm) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=f-m.fm header.s=fm3 header.b=OwKMgTz+; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=PJJBRy3u; dmarc=pass (policy=none) header.from=f-m.fm; spf=pass (mx1.freebsd.org: domain of void@f-m.fm designates 64.147.123.25 as permitted sender) smtp.mailfrom=void@f-m.fm Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 6A92C3200AC9 for ; Sun, 28 Jan 2024 11:28:27 -0500 (EST) Received: from imap46 ([10.202.2.96]) by compute6.internal (MEProxy); Sun, 28 Jan 2024 11:28:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=f-m.fm; h=cc :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1706459306; x=1706545706; bh=jq6owST6u+ u4x6e0hRtth9IpJmZgWTfHsr1149dYco4=; b=OwKMgTz+qZEV9dk5ENefbygr8I 0TJ1Q9riBd7tluMPLEWMRbUV42GEj5JeVhucXb8vCcTmvNQ7Rfr0bhavFAwSzQW+ 0eSPz4k7nVsegueY2plpW132XXrygAdioXhFHtiN9vp9yjpQDilDzHRl5cg8Cjen Xyyya8YU9jqp8xmBMUEnJwSpD32ZO3cpkZFv9Euv9gpev/5pXrPrDryfycnEvO/G ETdUqtEVYA/mbzJpwfQ/0cqCNkbUu5jGslflk+FehGeOGNvlIFFMfJt+vabnSUcv tbaLXQZZ54LsuOChNg993GWJbR1eXMLVzLuOYd2haBLvBwIl/QyKkUVZ0eHw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1706459306; x=1706545706; bh=jq6owST6u+u4x6e0hRtth9IpJmZg WTfHsr1149dYco4=; b=PJJBRy3u3FRbkrwXLnkXqaWlazTw8qUtq+kyz1eRPo4b UEc2vuuuc0WTSfGuxIKOoVPwBluwbm0u5H4J6je4n8akoJgjZ8jA7bAljApItaxP sIocwCT0/aGsZLghaP13dHuHEzVFLO/yzlXW1atNvGp1aIb8wxhutbeNyXN0E2px JCkKqg4vPgMZULPt+9YzcX3G3b6H6lHRnzvmmqQ7BYY4BbehRjvgiIlgKSsd4lg1 F4Mp/xg/aCcQJ4h+Pw+EiHUCQwmGYdzn/bXvMg9ag987S2Zu9HojJ4Lhmlc09Rml eb/knI2hYcHhKAD4RDeqlgLJpHEK4/nmBl1juSF4xw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrfedtvddgkeekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgggkfgjfhffhffvufgtsehttd ertderredtnecuhfhrohhmpehvohhiugcuoehvohhiugesfhdqmhdrfhhmqeenucggtffr rghtthgvrhhnpeeitedvueehtdehtddvhfeuhfevhedvieelvdeiffehveelheegfedule ejudekvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhm pehvohhiugesfhdqmhdrfhhm X-ME-Proxy: Feedback-ID: i2541463c:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id 9E3A22A2008B; Sun, 28 Jan 2024 11:28:26 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.11.0-alpha0-119-ga8b98d1bd8-fm-20240108.001-ga8b98d1b 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 Message-Id: <71f78e7a-0d25-446a-951c-79482c242429@app.fastmail.com> In-Reply-To: References: Date: Sun, 28 Jan 2024 16:28:05 +0000 From: void To: freebsd-current Subject: Re: make buildworld failure on arm64 on -current n267777 Content-Type: text/plain X-Spamd-Bar: ----- X-Spamd-Result: default: False [-5.49 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; DWL_DNSWL_LOW(-1.00)[messagingengine.com:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[f-m.fm,none]; RWL_MAILSPIKE_EXCELLENT(-0.40)[64.147.123.25:from]; R_DKIM_ALLOW(-0.20)[f-m.fm:s=fm3,messagingengine.com:s=fm3]; R_SPF_ALLOW(-0.20)[+ip4:64.147.123.25:c]; RCVD_IN_DNSWL_LOW(-0.10)[64.147.123.25:from]; MIME_GOOD(-0.10)[text/plain]; XM_UA_NO_VERSION(0.01)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US]; FROM_HAS_DN(0.00)[]; TO_DN_ALL(0.00)[]; FREEMAIL_FROM(0.00)[f-m.fm]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org]; DKIM_TRACE(0.00)[f-m.fm:+,messagingengine.com:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[f-m.fm] X-Rspamd-Queue-Id: 4TNH182JVJz4JhC On Fri, 26 Jan 2024, at 00:14, void wrote: > In /usr/src # git rev-list --count --first-parent HEAD > 267777 in /usr/src, a 'git reset --hard' followed by 'git pull' and then 'git checkout main' fixed this. For some reason, 'git pull --ff-only' didn't pull /usr/src/sys/contrib/dev/acpica/include/platform ! --