Brian Behlendorf
|
a93d76eb1b
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:07:11 -08:00 |
|
Brian Behlendorf
|
d2eae65894
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-13 15:07:09 -08:00 |
|
Brian Behlendorf
|
b14513e826
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 15:07:08 -08:00 |
|
Brian Behlendorf
|
4c31283afc
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 15:07:07 -08:00 |
|
Brian Behlendorf
|
2e9cd667d0
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2009-01-13 15:07:06 -08:00 |
|
Brian Behlendorf
|
fcd2296399
|
Additional rw_lock not being initialized cleaned in updated code
|
2009-01-13 15:05:02 -08:00 |
|
Brian Behlendorf
|
149c57fd06
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:02:15 -08:00 |
|
Brian Behlendorf
|
acd48f80d9
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-13 15:02:13 -08:00 |
|
Brian Behlendorf
|
60f5ac8ac7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 15:02:12 -08:00 |
|
Brian Behlendorf
|
4a5bd7a3a8
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 15:02:11 -08:00 |
|
Brian Behlendorf
|
6c96fc31e9
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 15:02:10 -08:00 |
|
Brian Behlendorf
|
bec036636e
|
List cleanup and use of list_node_init initializer
|
2009-01-13 15:00:12 -08:00 |
|
Brian Behlendorf
|
b052188ff6
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-13 14:18:16 -08:00 |
|
Brian Behlendorf
|
3b3a155dc4
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-13 14:18:12 -08:00 |
|
Brian Behlendorf
|
bdb0ce1a0d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 14:18:11 -08:00 |
|
Brian Behlendorf
|
552c9e1abb
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 14:18:10 -08:00 |
|
Brian Behlendorf
|
c6f1eca44b
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 14:18:09 -08:00 |
|
Brian Behlendorf
|
2ea04834bf
|
Remove assertion for now
|
2009-01-13 14:16:11 -08:00 |
|
Brian Behlendorf
|
bad8fae24d
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-13 13:32:36 -08:00 |
|
Brian Behlendorf
|
6eb210ddfe
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-13 13:32:32 -08:00 |
|
Brian Behlendorf
|
f8b66dcc4f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 13:32:31 -08:00 |
|
Brian Behlendorf
|
8ad629750e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-13 13:32:30 -08:00 |
|
Brian Behlendorf
|
bb9b10a830
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-13 13:32:29 -08:00 |
|
Brian Behlendorf
|
b73b29ab8e
|
Fix c90 issue with { }
|
2009-01-13 13:30:35 -08:00 |
|
Brian Behlendorf
|
a0f86c6571
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-13 12:32:07 -08:00 |
|
Brian Behlendorf
|
6c2e910597
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 12:32:03 -08:00 |
|
Brian Behlendorf
|
5a36a4b40b
|
Pull in needed hunk from old patch stack for a ZFS build without the ZPL support
|
2009-01-13 12:28:26 -08:00 |
|
Brian Behlendorf
|
f15ef90618
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:18:11 -08:00 |
|
Brian Behlendorf
|
7356c2045e
|
Update zpios.sh script to reference zfs not zpool, additionally remove unneed module load console message
|
2009-01-13 11:16:12 -08:00 |
|
Brian Behlendorf
|
13ab1d30be
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 16:53:53 -08:00 |
|
Brian Behlendorf
|
58df2601b0
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 16:53:49 -08:00 |
|
Brian Behlendorf
|
3977cefecc
|
Update load/unload message, mknod /dev/zfs when udev is unavailable
|
2009-01-09 16:50:28 -08:00 |
|
Brian Behlendorf
|
bd06c6eb0e
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 16:41:50 -08:00 |
|
Brian Behlendorf
|
cd56628b75
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 16:41:46 -08:00 |
|
Brian Behlendorf
|
7001fd57fa
|
Register sensible init/fini hooks
|
2009-01-09 16:38:13 -08:00 |
|
Brian Behlendorf
|
1ccec67674
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 16:32:13 -08:00 |
|
Brian Behlendorf
|
b19ccd10af
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 16:32:09 -08:00 |
|
Brian Behlendorf
|
d9a45283ce
|
Add ZFS load/unload console messages
|
2009-01-09 16:28:26 -08:00 |
|
Brian Behlendorf
|
598a2f5f4d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-09 16:11:55 -08:00 |
|
Brian Behlendorf
|
2f2ae376e8
|
ifdef out some zvol specific ioctls
|
2009-01-09 16:08:18 -08:00 |
|
Brian Behlendorf
|
1cf2f6a63e
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:57:21 -08:00 |
|
Brian Behlendorf
|
1475f7234b
|
Make the ZPL only bits conditional
|
2009-01-09 15:55:19 -08:00 |
|
Brian Behlendorf
|
2148f8256b
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:52:02 -08:00 |
|
Brian Behlendorf
|
ca3acc4f50
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 15:52:00 -08:00 |
|
Brian Behlendorf
|
1dc5e6d02e
|
Remove HAVE_SPL should be HAVE_ZPL
|
2009-01-09 15:50:00 -08:00 |
|
Brian Behlendorf
|
ca48ebe083
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:36:18 -08:00 |
|
Brian Behlendorf
|
f2b69bd921
|
Fix 2 more instances on XDR encoding which is not yet supported, us native encode
|
2009-01-09 15:34:32 -08:00 |
|
Brian Behlendorf
|
8f4340d3e8
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:11:58 -08:00 |
|
Brian Behlendorf
|
39184ef9b4
|
Only needed by ZPL
|
2009-01-09 15:08:36 -08:00 |
|
Brian Behlendorf
|
bed94035fd
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:46:42 -08:00 |