From nobody Wed Nov 29 15:14:30 2023 X-Original-To: dev-commits-src-main@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 4SgNCW4gRhz52qkG; Wed, 29 Nov 2023 15:14:31 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgNCW496Sz4ZZK; Wed, 29 Nov 2023 15:14:31 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701270871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=N3fucL/qF2pich5ndvYt6Br2j8uUp6P7ZdrQanr+8BA=; b=Xe4PJygo39cEh7a8/3fJScI5neH+MZu70bWDKDyBKqSKF+o5DO5Pqa4wN/pPKYAg00o75y JESkVUW3BJv6RbJiaHloQdTOUeBb842fwVMWKcf1zzWxO7Re/5nkRNGF3HeQICvk5PcofP ueQnrNd/US1jcS21Hx+y+/QHIxKS1v17GbadhnD3KreMSlxq68OfsYbeYnqIIA/T/lwW6X qT5x5CDHoZP5Hk5Qx8Lauzak1jQGT2Sk/KesHoK5z+77zr8o8Fbclh7n4YirrejlhvTsmJ JujRmITzjwvGa95A1wBLyUTV+Mu0aOOt8fmdQPRQvJiPAIcO4W11Dbrmp555Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701270871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=N3fucL/qF2pich5ndvYt6Br2j8uUp6P7ZdrQanr+8BA=; b=SiHGUjbOZNEVKcbNrXYbm6ijURzM5gtgAy27hfvvy4OmfVeCj/CKMUeux3WigH1CSQbd/k zog4dfmh739vo4vwFUEpL3fGyRYnrVbtfsiQlC85u0MxNGgiK/2HM2s1Zi1a1Gic0F/uE8 KD1sxt0f+Alq266D+h2HruZ4EupApz1qEBZC5ehQH3Rwb8qpCFObJRJeOyC8zmspDyPEVx OtWH/5sgVwCJcTwG2eFnWDn5cw4Ol01e/Zw0hlTNEgI8Jz6pKPbfodzkUQtxqev59D64mC +rvwYqefcyLpUtuSO1oMz4Ud1e+WEgTcGXGeIWLonnkzNooyIBuMtE28k5IW2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701270871; a=rsa-sha256; cv=none; b=rVpbZ35RaZLGFILfk39GQwvSTckH9TudFLvHtuZzES5gSbpToORvw46QEZcVLzp2GeAsMt PuZOkkxh2qu3NLru6Bz5zOhDEzZLMnOXV5Fzv61W8WRe3pugxwGiZoNobr8UcIL6msWTY7 Ltanmrn29DkbA3CNGb5S5jNw5eEAns+2e6YwZYsw0khTmhq1UBpdaMoIzmCzkscs1RRaJ4 9aWczFc+ygBRoob/MoFaJcHuHfTQRXdBcn34Mj7Icou1XeolU4xp40adObV5VpyDZquOT+ IvAINOQ/uJtCioAwzn9dxY2jLgG87s/fg6ucbh9RuC+uahag5DsZUgOFrHeaEw== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SgNCW2MRqzq83; Wed, 29 Nov 2023 15:14:31 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 459B51CADF; Wed, 29 Nov 2023 16:14:30 +0100 (CET) Date: Wed, 29 Nov 2023 16:14:30 +0100 From: Baptiste Daroussin To: Martin Matuska Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2276e53940c2 - main - zfs: merge openzfs/zfs@688514e47 Message-ID: <2md6axxcaidm44r7xqt5mtfylthx6rlb62gk45bctfrq6nfvfc@h4faamv7omqa> References: <202311282036.3ASKaEnm031847@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202311282036.3ASKaEnm031847@gitrepo.freebsd.org> On Tue, Nov 28, 2023 at 08:36:14PM +0000, Martin Matuska wrote: > The branch main has been updated by mm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=2276e53940c2a2bf7c7e9cb705e51de4202258c2 > > commit 2276e53940c2a2bf7c7e9cb705e51de4202258c2 > Merge: cd201c090858 688514e4704b > Author: Martin Matuska > AuthorDate: 2023-11-28 20:35:02 +0000 > Commit: Martin Matuska > CommitDate: 2023-11-28 20:35:58 +0000 > > zfs: merge openzfs/zfs@688514e47 > > Notable upstream pull request merges: > #15532 c1a47de86 zdb: Fix zdb '-O|-r' options with -e/exported zpool > #15535 cf3316633 ZVOL: Minor code cleanup > #15541 803a9c12c brt: lift internal definitions into _impl header > #15541 213d68296 zdb: show BRT statistics and dump its contents > #15543 a49087510 ZIL: Refactor TX_WRITE encryption similar to > TX_CLONE_RANGE > #15543 27d8c23c5 ZIL: Do not encrypt block pointers in lr_clone_range_t > #15549 67894a597 unnecessary alloc/free in dsl_scan_visitbp() > #15551 126efb588 FreeBSD: Fix the build on FreeBSD 12 > #15563 acb33ee1c FreeBSD: Fix ZFS so that snapshots under .zfs/snapshot are > NFS visible > #15564 7bbd42ef4 Don't allow attach to a raidz child vdev > #15566 688514e47 dmu_buf_will_clone: fix race in transition back to NOFILL > #15571 30d581121 dnode_is_dirty: check dnode and its data for dirtiness > > Obtained from: OpenZFS > OpenZFS commit: 688514e4704bdee4551d25960febd322ac26f297 > /home/bapt/worktrees/main/sys/contrib/openzfs/cmd/zdb/zdb.c:2129:37: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] /home/bapt/worktrees/main/sys/contrib/openzfs/cmd/zdb/zdb.c:2159:44: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] Best regards, Bapt