Date: Thu, 15 Aug 2024 07:28:36 +0000 From: Colin Percival <cperciva@tarsnap.com> To: Martin Matuska <mm@FreeBSD.org>, src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: d27c97326439 - stable/14 - zfs: merge openzfs/zfs@33174af15 (zfs-2.2-release) into stable/14 Message-ID: <0100019154f03fca-f79e4596-8a39-44d7-bb4c-3ecb9eb4effc-000000@email.amazonses.com> In-Reply-To: <202408130752.47D7q4vY064501@gitrepo.freebsd.org> References: <202408130752.47D7q4vY064501@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 8/13/24 00:52, Martin Matuska wrote: > The branch stable/14 has been updated by mm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=d27c97326439551596d63bfe9e7533fb49dbbb7b > > commit d27c97326439551596d63bfe9e7533fb49dbbb7b > Merge: 402db142e07a 33174af15112 > Author: Martin Matuska <mm@FreeBSD.org> > AuthorDate: 2024-08-12 13:06:18 +0000 > Commit: Martin Matuska <mm@FreeBSD.org> > CommitDate: 2024-08-13 07:52:28 +0000 > > zfs: merge openzfs/zfs@33174af15 (zfs-2.2-release) into stable/14 > > OpenZFS release 2.2.5 /usr/src/sys/contrib/openzfs/cmd/zdb/zdb.c:1241:8: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] Looks like f029f6277996760be4be42148295231af425cc2d needs to be merged too? -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?0100019154f03fca-f79e4596-8a39-44d7-bb4c-3ecb9eb4effc-000000>