Re: git: aca928a50a42 - main - zfs: merge openzfs/zfs@e2357561b

2024-05-31 Thread Warner Losh
This seems to break macos bootstrap: % ./tools/build/make.py TARGET=arm64 TARGET_ARCH=aarch64 -DNOCLEAN buildworld -j 20 .. --- assert.o --- /Users/imp/git/head/sys/contrib/openzfs/lib/libspl/assert.c:70:1: error: redefinition of 'libspl_gettid' libspl_gettid(void) ^ /Users/imp/git/head/sys/contri

git: aca928a50a42 - main - zfs: merge openzfs/zfs@e2357561b

2024-05-31 Thread Martin Matuska
The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=aca928a50a42f00f344df934005b09dbcb4e2f77 commit aca928a50a42f00f344df934005b09dbcb4e2f77 Merge: d28bbfa2715a e2357561b949 Author: Martin Matuska AuthorDate: 2024-05-31 07:31:58 + Commit: Martin Matu