Re: git: d27c97326439 - stable/14 - zfs: merge openzfs/zfs@33174af15 (zfs-2.2-release) into stable/14

In reply to: Martin Matuska : "git: d27c97326439 - stable/14 - zfs: merge openzfs/zfs@33174af15 (zfs-2.2-release) into stable/14"
Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Colin Percival <cperciva_at_tarsnap.com>
Date: Thu, 15 Aug 2024 07:28:36 UTC

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