From nobody Tue Feb 20 10:45:49 2024
X-Original-To: dev-commits-src-branches@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 4TfGKT3N2sz5BqfJ;
	Tue, 20 Feb 2024 10:46:05 +0000 (UTC)
	(envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mx1.freebsd.org (Postfix) with ESMTPS id 4TfGKT0BfSz4mKb;
	Tue, 20 Feb 2024 10:46:04 +0000 (UTC)
	(envelope-from kostikbel@gmail.com)
Authentication-Results: mx1.freebsd.org;
	none
Received: from tom.home (kib@localhost [127.0.0.1] (may be forged))
	by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 41KAjn7H044165;
	Tue, 20 Feb 2024 12:45:52 +0200 (EET)
	(envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 41KAjn7H044165
Received: (from kostik@localhost)
	by tom.home (8.18.1/8.18.1/Submit) id 41KAjnKx044164;
	Tue, 20 Feb 2024 12:45:49 +0200 (EET)
	(envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f
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>
References: <202402181246.41ICkO86055179@gitrepo.freebsd.org>
 <ZdPY4D1R1hM-UWsQ@spindle.one-eyed-alien.net>
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ZdPY4D1R1hM-UWsQ@spindle.one-eyed-alien.net>
X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
	DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM,
	NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0
X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home
X-Spamd-Bar: ----
X-Rspamd-Queue-Id: 4TfGKT0BfSz4mKb
X-Rspamd-Pre-Result: action=no action;
	module=replies;
	Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
	REPLY(-4.00)[];
	ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]

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?