Brian Behlendorf 1272941f49 Merge branch 'zfsonlinux/merge-spl' ... Merge a minimal version of the zfsonlinux/spl repository in to the zfsonlinux/zfs repository. Care was taken to prevent file conflicts when merging and to preserve the spl repository history. The spl kernel module remains under the GPLv2 license as documented by the additional THIRDPARTYLICENSE.gplv2 file. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>		2018-05-29 14:57:55 -07:00
..
linux	Prepare SPL repo to merge with ZFS repo	2018-05-29 14:51:39 -07:00
spl	Prepare SPL repo to merge with ZFS repo	2018-05-29 14:51:39 -07:00
sys	Prepare SPL repo to merge with ZFS repo	2018-05-29 14:51:39 -07:00
Makefile.am	Prepare SPL repo to merge with ZFS repo	2018-05-29 14:51:39 -07:00
libnvpair.h	Add JSON output support to channel programs	2018-03-19 12:40:58 -07:00
libuutil.h	Correct cppcheck errors	2017-09-19 12:17:29 -07:00
libuutil_common.h	Support custom build directories and move includes	2010-09-08 12:38:56 -07:00
libuutil_impl.h	Support custom build directories and move includes	2010-09-08 12:38:56 -07:00
libzfs.h	OpenZFS 9075 - Improve ZFS pool import/load process and corrupted pool recovery	2018-05-08 21:35:27 -07:00
libzfs_core.h	OpenZFS 7614, 9064 - zfs device evacuation/removal	2018-04-14 12:16:17 -07:00
libzfs_impl.h	OpenZFS 7431 - ZFS Channel Programs	2018-02-08 15:28:18 -08:00
thread_pool.h	Add libtpool (thread pools)	2017-08-09 15:31:08 -07:00
zfeature_common.h	OpenZFS 7614, 9064 - zfs device evacuation/removal	2018-04-14 12:16:17 -07:00
zfs_comutil.h	Illumos #2882, #2883, #2900	2013-09-04 15:49:00 -07:00
zfs_deleg.h	OpenZFS 7614, 9064 - zfs device evacuation/removal	2018-04-14 12:16:17 -07:00
zfs_fletcher.h	DLPX-44812 integrate EP-220 large memory scalability	2016-11-29 14:34:27 -08:00
zfs_namecheck.h	OpenZFS 7386 - zfs get does not work properly with bookmarks	2017-01-26 14:42:15 -08:00
zfs_prop.h	Native Encryption for ZFS on Linux	2017-08-14 10:36:48 -07:00