Brian Behlendorf
|
553f8768b4
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-21 11:39:57 -08:00 |
|
Brian Behlendorf
|
a30c56ed35
|
Prep for 0.4.1 tag
|
2009-01-21 11:37:12 -08:00 |
|
Brian Behlendorf
|
47802f4afc
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-21 11:29:18 -08:00 |
|
Brian Behlendorf
|
4cee20b087
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-21 11:29:17 -08:00 |
|
Brian Behlendorf
|
ef39ff845b
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-21 11:29:10 -08:00 |
|
Brian Behlendorf
|
5d233af2da
|
Add TODO
|
2009-01-21 11:26:19 -08:00 |
|
Brian Behlendorf
|
3ea7b078ea
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-20 21:37:26 -08:00 |
|
Brian Behlendorf
|
428e6faf71
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-20 21:37:25 -08:00 |
|
Brian Behlendorf
|
1ccab0aa8f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-20 21:37:17 -08:00 |
|
Brian Behlendorf
|
39fe5b1cf9
|
Minor script fixes
|
2009-01-20 21:34:29 -08:00 |
|
Brian Behlendorf
|
59336e9a54
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-20 21:09:14 -08:00 |
|
Brian Behlendorf
|
9580a0edfb
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-20 21:09:12 -08:00 |
|
Brian Behlendorf
|
8bae519eae
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-20 21:08:55 -08:00 |
|
Brian Behlendorf
|
15c9eb903f
|
Add 4 basic file based testr configs
|
2009-01-20 21:03:02 -08:00 |
|
Brian Behlendorf
|
f2a40ac2d3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-20 17:03:37 -08:00 |
|
Brian Behlendorf
|
a9eb11f125
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-20 17:03:35 -08:00 |
|
Brian Behlendorf
|
287257c817
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-20 17:03:19 -08:00 |
|
Brian Behlendorf
|
40c5baafa2
|
Add file based config, and update the lo config to use real loopback devices, interestingly this currently fails
|
2009-01-20 16:57:45 -08:00 |
|
Brian Behlendorf
|
3abe41dde6
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-20 16:23:18 -08:00 |
|
Brian Behlendorf
|
c05fb180d9
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-20 16:23:17 -08:00 |
|
Brian Behlendorf
|
e10c78afb6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-20 16:23:00 -08:00 |
|
Brian Behlendorf
|
5a145659a3
|
Refresh README
|
2009-01-20 16:16:57 -08:00 |
|
Brian Behlendorf
|
d15907c8a6
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-20 15:47:15 -08:00 |
|
Brian Behlendorf
|
a25215646b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-20 15:47:15 -08:00 |
|
Brian Behlendorf
|
fa44cc9f36
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-20 15:47:07 -08:00 |
|
Brian Behlendorf
|
823b23ad60
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-20 15:46:28 -08:00 |
|
Brian Behlendorf
|
e12f2e6b7b
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-01-20 15:46:27 -08:00 |
|
Brian Behlendorf
|
becc565154
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2009-01-20 15:46:27 -08:00 |
|
Brian Behlendorf
|
6425f28bca
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2009-01-20 15:46:26 -08:00 |
|
Brian Behlendorf
|
3c39b49269
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2009-01-20 15:46:26 -08:00 |
|
Brian Behlendorf
|
e664f28e47
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-20 15:46:24 -08:00 |
|
Brian Behlendorf
|
b1dbe3a983
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-20 15:46:24 -08:00 |
|
Brian Behlendorf
|
9246e144c6
|
Merge commit 'refs/top-bases/fix-list' into fix-list
|
2009-01-20 15:46:23 -08:00 |
|
Brian Behlendorf
|
147b23e448
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-20 15:46:23 -08:00 |
|
Brian Behlendorf
|
5c6765ab5a
|
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
|
2009-01-20 15:46:22 -08:00 |
|
Brian Behlendorf
|
bb96cb59f7
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2009-01-20 15:46:22 -08:00 |
|
Brian Behlendorf
|
1b0e74e578
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2009-01-20 15:46:21 -08:00 |
|
Brian Behlendorf
|
a4c4b9c664
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2009-01-20 15:46:20 -08:00 |
|
Brian Behlendorf
|
677f9c1b3e
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2009-01-20 15:46:19 -08:00 |
|
Brian Behlendorf
|
389cd40af7
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2009-01-20 15:46:19 -08:00 |
|
Brian Behlendorf
|
60bc04838f
|
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
|
2009-01-20 15:46:18 -08:00 |
|
Brian Behlendorf
|
b6182cb8fa
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2009-01-20 15:46:18 -08:00 |
|
Brian Behlendorf
|
9a0db68e1d
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2009-01-20 15:46:16 -08:00 |
|
Brian Behlendorf
|
3237db02df
|
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
|
2009-01-20 15:46:16 -08:00 |
|
Brian Behlendorf
|
1e8ef3b860
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2009-01-20 15:46:15 -08:00 |
|
Brian Behlendorf
|
865aa2efa0
|
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
|
2009-01-20 15:46:15 -08:00 |
|
Brian Behlendorf
|
1d4cbe306a
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2009-01-20 15:46:14 -08:00 |
|
Brian Behlendorf
|
30175c1cc8
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2009-01-20 15:46:13 -08:00 |
|
Brian Behlendorf
|
b06c3f25ec
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2009-01-20 15:46:12 -08:00 |
|
Brian Behlendorf
|
3f9bef3374
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2009-01-20 15:46:12 -08:00 |