On 9/21/22 5:54 AM, Martin Matuska wrote:
The branch main has been updated by mm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c7046f76c2c027b00c0e6ba57cfd28f1a78f5e23
commit c7046f76c2c027b00c0e6ba57cfd28f1a78f5e23
Merge: 440217b0af5f c629f0bf62e3
Author: Martin Matuska <m...@freebsd.org>
AuthorDate: 2022-09-21 12:17:13 +0000
Commit: Martin Matuska <m...@freebsd.org>
CommitDate: 2022-09-21 12:17:13 +0000
zfs: merge openzfs/zfs@c629f0bf6
Notable upstream pull request merges:
#13725 Fix BLAKE3 tuneable and module loading on Linux and FreeBSD
#13756 FreeBSD: Organize sysctls
#13773 FreeBSD: add kqfilter support for zvol cdev
#13781 Importing from cachefile can trip assertion
#13794 Apply arc_shrink_shift to ARC above arc_c_min
#13798 Improve too large physical ashift handling
#13799 Revert "Avoid panic with recordsize > 128k, raw sending and
no large_blocks"
#13802 Add zfs.sync.snapshot_rename
#13831 zfs_enter rework
#13855 zfs recv hangs if max recordsize is less than received
recordsize
Obtained from: OpenZFS
OpenZFS commit: c629f0bf62e351355716f9870d6c2e377584b016
This broke powerpc world builds:
In file included from
/usr/home/john/work/git/mips_xbuild/sys/contrib/openzfs/module/icp/algs/aes/aes_impl.c:28:
/usr/home/john/work/git/mips_xbuild/sys/contrib/openzfs/lib/libspl/include/sys/simd.h:461:22:
error: static declaration of 'getauxval' follows non-static declaration
static unsigned long getauxval(unsigned long key)
^
/usr/home/john/work/git/mips_xbuild/sys/contrib/openzfs/lib/libspl/include/sys/simd.h:456:22:
note: previous declaration is here
extern unsigned long getauxval(unsigned long type);
^
Also broke powerpc64 kernels:
In file included from
/usr/home/john/work/git/mips_xbuild/sys/contrib/openzfs/module/icp/algs/blake3/blake3.c:31:
In file included from
/usr/home/john/work/git/mips_xbuild/sys/contrib/openzfs/module/icp/algs/blake3/blake3_impl.h:37:
In file included from
/usr/home/john/work/git/mips_xbuild/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd.h:36:
/usr/home/john/work/git/mips_xbuild/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h:56:10:
fatal error: 'powerpc/cpu.h' file not found
#include <powerpc/cpu.h>
^~~~~~~~~~~~~~~
1 error generated.
*** Error code 1
--
John Baldwin
