Date: Tue, 20 Feb 2024 12:45:49 +0200 From: Konstantin Belousov <kostikbel@gmail.com> To: Brooks Davis <brooks@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: bda0c0dc87c5 - stable/14 - Remove redundand prototype, fixing the build. Message-ID: <ZdSC3W7tdqGVCJnP@kib.kiev.ua> In-Reply-To: <ZdPY4D1R1hM-UWsQ@spindle.one-eyed-alien.net> References: <202402181246.41ICkO86055179@gitrepo.freebsd.org> <ZdPY4D1R1hM-UWsQ@spindle.one-eyed-alien.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Feb 19, 2024 at 10:40:32PM +0000, Brooks Davis wrote: > On Sun, Feb 18, 2024 at 12:46:24PM +0000, Konstantin Belousov wrote: > > The branch stable/14 has been updated by kib: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=bda0c0dc87c54b611d96b6d0dc1947819ffec083 > > > > commit bda0c0dc87c54b611d96b6d0dc1947819ffec083 > > Author: Konstantin Belousov <kib@FreeBSD.org> > > AuthorDate: 2024-02-18 12:45:49 +0000 > > Commit: Konstantin Belousov <kib@FreeBSD.org> > > CommitDate: 2024-02-18 12:45:49 +0000 > > > > Remove redundand prototype, fixing the build. > > > > This is a direct commit to stable/14. > > It would be best to revert this and cherry-pick the upstream commit > 3e4bef52b084d (also in our vendor tree) to avoid conflicts in future > merges of openzfs. Then some config.h needs to be regenerated. Can you provide me a pointer how to do that?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ZdSC3W7tdqGVCJnP>