freebsd-src/sys/contrib/openzfs
Jessica Clarke fe2b60f87e openzfs: Fix mismerge breaking macOS bootstrap
Upstream added the libspl_gettid implementation for macOS and when
merging back to FreeBSD this resulted in two copies of the same code.
Delete this second copy, restoring the file to be the same as upstream.

Fixes:	aca928a50a ("zfs: merge openzfs/zfs@e2357561b")
2024-05-31 22:12:18 +01:00
..
.github zfs: merge openzfs/zfs@2e6b3c4d9 2024-01-31 00:06:04 +01:00
cmd zfs: merge openzfs/zfs@e2357561b 2024-05-31 11:26:50 +02:00
config zfs: merge openzfs/zfs@e2357561b 2024-05-31 11:26:50 +02:00
contrib zfs: merge openzfs/zfs@8f1b7a6fa 2024-05-03 18:05:08 +02:00
etc zfs: merge openzfs/zfs@90ba19eb7 2024-04-16 22:54:07 +02:00
include zfs: merge openzfs/zfs@e2357561b 2024-05-31 11:26:50 +02:00
lib openzfs: Fix mismerge breaking macOS bootstrap 2024-05-31 22:12:18 +01:00
man zfs: merge openzfs/zfs@e2357561b 2024-05-31 11:26:50 +02:00
module zfs: merge openzfs/zfs@e2357561b 2024-05-31 11:26:50 +02:00
rpm zfs: merge openzfs/zfs@1f940de07 2024-04-23 23:59:18 +02:00
scripts zfs: merge openzfs/zfs@1f940de07 2024-04-23 23:59:18 +02:00
tests zfs: merge openzfs/zfs@e2357561b 2024-05-31 11:26:50 +02:00
udev zfs: merge openzfs/zfs@39be46f43 2024-03-30 23:54:24 +01:00
.cirrus.yml zfs: merge openzfs/zfs@66b81b349 2023-10-08 09:43:15 +02:00
.editorconfig
.gitignore zfs: merge openzfs/zfs@03e9caaec 2023-11-17 09:39:42 +01:00
.mailmap zfs: merge openzfs/zfs@90ba19eb7 2024-04-16 22:54:07 +02:00
AUTHORS zfs: merge openzfs/zfs@90ba19eb7 2024-04-16 22:54:07 +02:00
autogen.sh zfs: merge openzfs/zfs@59493b63c (master) 2022-12-07 14:10:46 +01:00
CODE_OF_CONDUCT.md zfs: merge openzfs/zfs@9cd71c860 (master) 2023-01-25 19:50:29 +01:00
configure.ac zfs: merge openzfs/zfs@03e9caaec 2023-11-17 09:39:42 +01:00
copy-builtin
COPYRIGHT
LICENSE
Makefile.am zfs: merge openzfs/zfs@2163cde45 2022-11-16 21:27:42 +01:00
META zfs: merge openzfs/zfs@1f940de07 2024-04-23 23:59:18 +02:00
NEWS
NOTICE
README.md zfs: merge openzfs/zfs@688514e47 2023-11-28 21:35:58 +01:00
RELEASES.md
TEST
zfs.release.in

img

OpenZFS is an advanced file system and volume manager which was originally developed for Solaris and is now maintained by the OpenZFS community. This repository contains the code for running OpenZFS on Linux and FreeBSD.

codecov coverity

Official Resources

Installation

Full documentation for installing OpenZFS on your favorite operating system can be found at the Getting Started Page.

Contribute & Develop

We have a separate document with contribution guidelines.

We have a Code of Conduct.

Release

OpenZFS is released under a CDDL license. For more details see the NOTICE, LICENSE and COPYRIGHT files; UCRL-CODE-235197

Supported Kernels

  • The META file contains the officially recognized supported Linux kernel versions.
  • Supported FreeBSD versions are any supported branches and releases starting from 12.4-RELEASE.