Brian Behlendorf
|
cc0a52c939
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-20 14:38:19 -07:00 |
|
Brian Behlendorf
|
daa5c38101
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-20 14:38:18 -07:00 |
|
Brian Behlendorf
|
a08ea6e0a7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-20 14:37:56 -07:00 |
|
Brian Behlendorf
|
d83c361158
|
Prep for zfs-0.4.3 tag (Fix spelling)
|
2009-03-20 14:28:17 -07:00 |
|
Brian Behlendorf
|
11978efb62
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-20 14:22:21 -07:00 |
|
Brian Behlendorf
|
e1fc193990
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-20 14:22:20 -07:00 |
|
Brian Behlendorf
|
1072e031f6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-20 14:21:53 -07:00 |
|
Brian Behlendorf
|
a7da34e996
|
Prep for zfs-0.4.3 tag
|
2009-03-20 14:11:49 -07:00 |
|
Brian Behlendorf
|
cc5ce72296
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-20 13:26:38 -07:00 |
|
Brian Behlendorf
|
f47473638b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-20 13:26:36 -07:00 |
|
Brian Behlendorf
|
9bee47e648
|
Export additional txg_* symbols.
|
2009-03-20 13:17:23 -07:00 |
|
Brian Behlendorf
|
fe14e8358c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-20 09:31:25 -07:00 |
|
Brian Behlendorf
|
8f44809fd0
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-20 09:31:22 -07:00 |
|
Brian Behlendorf
|
dddcb5433e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-20 09:31:02 -07:00 |
|
Brian Behlendorf
|
f53e5a851d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-20 09:29:22 -07:00 |
|
Brian Behlendorf
|
0c88bc3ccd
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2009-03-20 09:29:21 -07:00 |
|
Brian Behlendorf
|
fe77fb7907
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-03-20 09:29:17 -07:00 |
|
Brian Behlendorf
|
9476bd93ca
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2009-03-20 09:29:17 -07:00 |
|
Brian Behlendorf
|
13814fe220
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
|
2009-03-20 09:29:16 -07:00 |
|
Brian Behlendorf
|
99da5f93e8
|
Fix uninitialized variable error in ztest_dmu_commit_callbacks()
|
2009-03-20 09:20:49 -07:00 |
|
Brian Behlendorf
|
8c8e10d491
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-19 21:30:35 -07:00 |
|
Brian Behlendorf
|
18569f4b9e
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-19 21:30:34 -07:00 |
|
Brian Behlendorf
|
61914d7403
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-19 21:30:15 -07:00 |
|
Brian Behlendorf
|
bd1685ee4e
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-19 21:28:51 -07:00 |
|
Brian Behlendorf
|
1769e10f17
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2009-03-19 21:28:50 -07:00 |
|
Brian Behlendorf
|
a891a11671
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-03-19 21:28:48 -07:00 |
|
Brian Behlendorf
|
6d883d7d40
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2009-03-19 21:28:48 -07:00 |
|
Brian Behlendorf
|
63781842e3
|
Update mutex_lock to pthread_mutex_lock for zcl->zcl_callback_locks.
|
2009-03-19 21:21:35 -07:00 |
|
Brian Behlendorf
|
64684cadfa
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
|
2009-03-19 21:19:28 -07:00 |
|
Brian Behlendorf
|
fed604c844
|
Add extra () requested by gcc
|
2009-03-19 21:18:54 -07:00 |
|
Brian Behlendorf
|
57c6cf3c4c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-19 21:08:41 -07:00 |
|
Brian Behlendorf
|
bf3d911bc1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-19 21:08:39 -07:00 |
|
Brian Behlendorf
|
275f4aae5d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:
module/zfs/dmu_tx.c
|
2009-03-19 21:08:17 -07:00 |
|
Brian Behlendorf
|
e7f02d3b41
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-19 20:59:33 -07:00 |
|
Brian Behlendorf
|
eb811f7fa9
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
|
2009-03-19 20:59:12 -07:00 |
|
Brian Behlendorf
|
a71161249a
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-03-19 20:57:53 -07:00 |
|
Brian Behlendorf
|
c89153393f
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-03-19 20:51:18 -07:00 |
|
Brian Behlendorf
|
f180959bac
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2009-03-19 20:51:18 -07:00 |
|
Brian Behlendorf
|
a32dc3b04b
|
New TopGit dependency: feature-pthreads
|
2009-03-19 20:51:17 -07:00 |
|
Brian Behlendorf
|
54b5b41a58
|
Add 'feature-pthreads' branch to features branch.
|
2009-03-19 20:49:52 -07:00 |
|
Brian Behlendorf
|
29703a5b4e
|
Add 'feature-commit-cb' branch for DMU commit callbacks.
|
2009-03-19 20:30:14 -07:00 |
|
Brian Behlendorf
|
182e9e0973
|
Remove 'fix-pthreads' dependency from 'fix-branch'
|
2009-03-19 19:59:10 -07:00 |
|
Brian Behlendorf
|
37a1ac2093
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-19 19:56:09 -07:00 |
|
Brian Behlendorf
|
d8e81db97b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-19 19:56:08 -07:00 |
|
Brian Behlendorf
|
dabea57f25
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-19 19:55:49 -07:00 |
|
Brian Behlendorf
|
8c43ad3853
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-19 19:49:56 -07:00 |
|
Brian Behlendorf
|
8cdcf1ef44
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-03-19 19:49:55 -07:00 |
|
Brian Behlendorf
|
f681a33757
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-03-19 19:49:53 -07:00 |
|
Brian Behlendorf
|
05cec154f5
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2009-03-19 19:49:53 -07:00 |
|
Brian Behlendorf
|
53db4c7b29
|
Revert fix-pthreads moving to feature-pthreads branch
|
2009-03-19 19:43:09 -07:00 |