0d4d1a7861
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
...
Conflicts:
module/zfs/dsl_dataset.c
2010-05-28 13:52:52 -07:00
428870ff73
Update core ZFS code from build 121 to build 141.
2010-05-28 13:45:14 -07:00
e3dccb9279
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-05-18 15:00:54 -07:00
6119cb885a
Add AUTHORS to master branch
2010-05-18 14:55:01 -07:00
1be176aaef
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-05-18 14:33:23 -07:00
fa94cf43b9
Update COPYRIGHT to reference zpios CDDL exceptions.
2010-05-18 14:25:28 -07:00
c9d613e12e
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-05-18 11:13:47 -07:00
94d52d93d9
Update COPYRIGHT to include release id LLNL-CODE-403049.
2010-05-18 11:06:56 -07:00
ee035079d5
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-05-18 10:39:03 -07:00
91ac110c9c
Update COPYRIGHT and DISCLAIMER.
...
Update the COPYRIGHT and DISCLAIMER in an attempt to be clear about
the copyright and licensing issues.
2010-05-18 10:32:23 -07:00
1a18829f86
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-04-29 12:04:15 -07:00
3affbe6d7e
Update nvpair's to include nv_alloc_fixed support
2010-04-29 11:59:41 -07:00
52867336be
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-04-29 10:41:36 -07:00
fa42225a3d
Add Solaris FMA style support
2010-04-29 10:37:15 -07:00
d8fb08731e
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-03-11 09:55:23 -08:00
414f1f975e
Rename update-zfs.sh -> zfs-update.sh for consistency
2010-03-11 09:53:59 -08:00
be64029df4
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-03-09 14:19:47 -08:00
774f7c02b1
Ignore unsigned module build products
...
Along with the addition of signed kernel modules in newer kernel
we have a few new build products we need to ignore. LKLM has the
whole thread for those interested: http://lkml.org/lkml/2007/2/14/164
2010-03-09 14:14:09 -08:00
5bd6eac343
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-01-08 11:39:22 -08:00
4cd8e49a69
Add .gitignore files to exclude build products
2010-01-08 11:35:17 -08:00
aebea63638
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-12-11 16:22:06 -08:00
058ac9ba78
Pull in latest man pages as part of update-zfs.sh
...
The script has been updated to download the latest documentations
packages for Solaris and extract the needed ZFS man pages. These
will still need a little markup to handle changes between the
Solaris and Linux versions of ZFS. Howver, they should be pretty
minor I've tried hard to keep the interface the same.
In additional to the script update the zdb, zfs, and zpool man
pages have been added to the repo.
2009-12-11 16:15:33 -08:00
45b0c5f49c
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-11-15 16:26:45 -08:00
0aa61e8427
Remove zvol.c when updating in update-zfs.sh Linux version available.
2009-11-15 16:20:01 -08:00
49529232e1
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-10-09 15:43:13 -07:00
5c36312909
Script update-zfs.sh updated to include libefi library
2009-10-09 15:37:29 -07:00
169f50db79
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-08-18 12:09:52 -07:00
45d1cae3b8
Rebase master to b121
2009-08-18 11:43:27 -07:00
a1e0f402bf
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-07-06 13:13:14 -07:00
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
56aabda0f9
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-02-18 14:29:16 -08:00
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
7cce398964
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-01-26 22:01:07 -08:00
c65e71073f
Refresh type in topgit git://* reference
2009-01-26 21:58:32 -08:00
677f9c1b3e
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-01-20 15:46:19 -08:00
4710ede86a
Add GIT to master
2009-01-20 15:43:44 -08:00
7c80f43566
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-01-15 14:16:06 -08:00
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
fcd2296399
Additional rw_lock not being initialized cleaned in updated code
2009-01-13 15:05:02 -08:00
c239bd53d2
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-01-05 12:08:46 -08:00
42bcb36c89
Add unicode library
2009-01-05 12:03:23 -08:00
53cefccd76
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-01-05 11:11:49 -08:00
36b849fa51
Remove zdump, it's an unrelateds command which I added simply due to the z* command convention
2009-01-05 11:10:13 -08:00
9064b819f0
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2008-12-12 13:46:49 -08:00
810db7e0a2
Remove zcommon reference merged in to zpool
2008-12-12 13:41:20 -08:00
70227f55c1
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2008-12-11 15:40:38 -08:00
6b2c60acca
Moving lib/libspl to linux-libspl branch
2008-12-11 15:38:59 -08:00
32a5a583a3
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2008-12-11 14:25:22 -08:00
a4076c7544
Script updates
2008-12-11 14:21:14 -08:00
c4911ece24
Move library files to lib
2008-12-11 14:16:55 -08:00
Brian Behlendorf