Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 28 Jan 2024 16:28:05 +0000
From:      void <void@f-m.fm>
To:        freebsd-current <freebsd-current@freebsd.org>
Subject:   Re: make buildworld failure on arm64 on -current n267777
Message-ID:  <71f78e7a-0d25-446a-951c-79482c242429@app.fastmail.com>
In-Reply-To: <cbbb385f-c49e-48e5-b132-804c8a0b784f@app.fastmail.com>
References:  <cbbb385f-c49e-48e5-b132-804c8a0b784f@app.fastmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
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 !

-- 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?71f78e7a-0d25-446a-951c-79482c242429>