Brian Behlendorf
|
cb55f9a832
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 14:29:11 -08:00 |
|
Brian Behlendorf
|
43b4c537eb
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-15 14:29:10 -08:00 |
|
Brian Behlendorf
|
f969333c73
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-15 14:29:09 -08:00 |
|
Brian Behlendorf
|
c4fc002c87
|
Resolve C90 int declared in for() construct
|
2009-01-15 14:26:52 -08:00 |
|
Brian Behlendorf
|
de66052064
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-15 14:21:55 -08:00 |
|
Brian Behlendorf
|
465b2c795d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-15 14:21:24 -08:00 |
|
Brian Behlendorf
|
2c83372734
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-15 14:21:11 -08:00 |
|
Brian Behlendorf
|
767928dcd2
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-15 14:20:55 -08:00 |
|
Brian Behlendorf
|
091a4a4ca4
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:20:49 -08:00 |
|
Brian Behlendorf
|
1f372d9030
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:18:01 -08:00 |
|
Brian Behlendorf
|
8684f3ea64
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-15 14:16:25 -08:00 |
|
Brian Behlendorf
|
ddaad20220
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 14:16:23 -08:00 |
|
Brian Behlendorf
|
089836c3e4
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:14:57 -08:00 |
|
Brian Behlendorf
|
551838a6c8
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:13:39 -08:00 |
|
Brian Behlendorf
|
b633e4f669
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2009-01-15 14:11:26 -08:00 |
|
Brian Behlendorf
|
da7151a89e
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:11:19 -08:00 |
|
Brian Behlendorf
|
7aa64936aa
|
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
|
2009-01-15 14:05:35 -08:00 |
|
Brian Behlendorf
|
977fef2ba7
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2009-01-15 14:05:32 -08:00 |
|
Brian Behlendorf
|
2f36bf5af4
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2009-01-15 14:05:29 -08:00 |
|
Brian Behlendorf
|
a2e601c6e3
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2009-01-15 14:04:39 -08:00 |
|
Brian Behlendorf
|
3fa768e21b
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:04:35 -08:00 |
|
Brian Behlendorf
|
d3df6b2012
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2009-01-15 14:01:51 -08:00 |
|
Brian Behlendorf
|
fb5f0bc833
|
Rebase master to b105
|
2009-01-15 13:59:39 -08:00 |
|
Brian Behlendorf
|
8b1bccfddf
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-14 13:32:44 -08:00 |
|
Brian Behlendorf
|
904640e3c7
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:32:33 -08:00 |
|
Brian Behlendorf
|
fb941c67fa
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-14 13:32:31 -08:00 |
|
Brian Behlendorf
|
c0edd1f948
|
Remove unneeded header
|
2009-01-14 13:30:32 -08:00 |
|
Brian Behlendorf
|
50832652c2
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-14 08:42:33 -08:00 |
|
Brian Behlendorf
|
03f6a88536
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-14 08:42:29 -08:00 |
|
Brian Behlendorf
|
ad1dde3678
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-14 08:42:11 -08:00 |
|
Brian Behlendorf
|
b8ca971861
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-14 08:42:00 -08:00 |
|
Brian Behlendorf
|
1194e0412f
|
Change all instances of kpios to zpios
|
2009-01-14 08:38:35 -08:00 |
|
Brian Behlendorf
|
f63f4dd2cd
|
Remove unneeded chunk, create a FS the real way with an ioctl
|
2009-01-14 08:26:09 -08:00 |
|
Brian Behlendorf
|
4497cfb321
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:49:26 -08:00 |
|
Brian Behlendorf
|
9ab30b2e96
|
Use zpios not kpios for referce
|
2009-01-13 16:42:21 -08:00 |
|
Brian Behlendorf
|
7635d14cd1
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-13 16:09:27 -08:00 |
|
Brian Behlendorf
|
2dac6d5542
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-13 16:08:32 -08:00 |
|
Brian Behlendorf
|
ae893fadc9
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 16:08:13 -08:00 |
|
Brian Behlendorf
|
7783aee79c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 16:07:47 -08:00 |
|
Brian Behlendorf
|
fce0143a40
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 16:07:45 -08:00 |
|
Brian Behlendorf
|
083b3d000c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:06:37 -08:00 |
|
Brian Behlendorf
|
622ce10cde
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-13 16:06:30 -08:00 |
|
Brian Behlendorf
|
04d7ae5f22
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 16:06:28 -08:00 |
|
Brian Behlendorf
|
c186f81c6d
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 16:06:26 -08:00 |
|
Brian Behlendorf
|
e1632568f1
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 16:06:23 -08:00 |
|
Brian Behlendorf
|
be0b4029db
|
Initialize list links
|
2009-01-13 16:02:19 -08:00 |
|
Brian Behlendorf
|
5ae7f2d447
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-13 15:35:25 -08:00 |
|
Brian Behlendorf
|
95db697cc4
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-13 15:35:01 -08:00 |
|
Brian Behlendorf
|
392993d32a
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 15:34:51 -08:00 |
|
Brian Behlendorf
|
43ac9f83e1
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 15:34:39 -08:00 |
|
Brian Behlendorf
|
c3335290e2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 15:34:38 -08:00 |
|
Brian Behlendorf
|
38f7defc95
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:34:04 -08:00 |
|
Brian Behlendorf
|
93b6e66d9b
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-13 15:34:01 -08:00 |
|
Brian Behlendorf
|
32baeb1712
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 15:34:01 -08:00 |
|
Brian Behlendorf
|
0d6b81fcca
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 15:34:00 -08:00 |
|
Brian Behlendorf
|
43cd437415
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 15:33:59 -08:00 |
|
Brian Behlendorf
|
94944fab96
|
Fix proper list node initialization
|
2009-01-13 15:31:58 -08:00 |
|
Brian Behlendorf
|
5ddcc115b3
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-13 15:08:32 -08:00 |
|
Brian Behlendorf
|
de43f9a57c
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-13 15:08:08 -08:00 |
|
Brian Behlendorf
|
d851db8193
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 15:07:58 -08:00 |
|
Brian Behlendorf
|
62d5f771e5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 15:07:45 -08:00 |
|
Brian Behlendorf
|
925ed2c7a0
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 15:07:44 -08:00 |
|
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
|
ff35f88f33
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-13 15:03:36 -08:00 |
|
Brian Behlendorf
|
e095be1cc5
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-13 15:03:12 -08:00 |
|
Brian Behlendorf
|
89351f06c5
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 15:03:02 -08:00 |
|
Brian Behlendorf
|
fd1da7d6b9
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 15:02:50 -08:00 |
|
Brian Behlendorf
|
042deede25
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 15:02:49 -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
|
6bc9ddf743
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-13 14:19:36 -08:00 |
|
Brian Behlendorf
|
4ef8421b03
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-13 14:19:13 -08:00 |
|
Brian Behlendorf
|
d588bf5c71
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 14:19:03 -08:00 |
|
Brian Behlendorf
|
6ec00152b1
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 14:18:51 -08:00 |
|
Brian Behlendorf
|
b289f6dd98
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 14:18:50 -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
|
9fc1da9334
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-13 13:33:54 -08:00 |
|
Brian Behlendorf
|
323f4f67dd
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-13 13:33:31 -08:00 |
|
Brian Behlendorf
|
721cadbea8
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 13:33:22 -08:00 |
|
Brian Behlendorf
|
43b31e2884
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 13:33:10 -08:00 |
|
Brian Behlendorf
|
935c8157f9
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 13:33:09 -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
|
08bc5aa405
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 12:32:30 -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
|
a62a385848
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 16:54:15 -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
|
2250c070f8
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 16:42:12 -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
|
f3a2522a14
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 16:32:36 -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
|
1d1886b5f9
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 15:52:13 -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 |
|
Brian Behlendorf
|
a7e5f34acb
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 14:46:41 -08:00 |
|
Brian Behlendorf
|
7ea7020636
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-09 14:46:27 -08:00 |
|
Brian Behlendorf
|
d7e52cccea
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-09 14:46:05 -08:00 |
|
Brian Behlendorf
|
d584ad239d
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 14:46:01 -08:00 |
|
Brian Behlendorf
|
4022f85bac
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 14:45:56 -08:00 |
|
Brian Behlendorf
|
764c8c5940
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 14:45:45 -08:00 |
|
Brian Behlendorf
|
be3a17e437
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 14:45:45 -08:00 |
|
Brian Behlendorf
|
d315fcf28e
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:45:13 -08:00 |
|
Brian Behlendorf
|
acafe53c8e
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 14:45:12 -08:00 |
|
Brian Behlendorf
|
fba5a806a8
|
ifdef HAVE_ZPL out source files with only ZPL bits
|
2009-01-09 14:43:22 -08:00 |
|
Brian Behlendorf
|
ff09d64647
|
Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches
|
2009-01-09 14:37:45 -08:00 |
|
Brian Behlendorf
|
7b6040235d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:30:32 -08:00 |
|
Brian Behlendorf
|
9ef637b057
|
Add minimum needed zvol bits
|
2009-01-09 14:28:50 -08:00 |
|
Brian Behlendorf
|
bd6fb32e4c
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 14:19:25 -08:00 |
|
Brian Behlendorf
|
cdba663ce4
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-09 14:19:11 -08:00 |
|
Brian Behlendorf
|
ccb1f1c5d4
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-09 14:18:47 -08:00 |
|
Brian Behlendorf
|
5e7aec0a54
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 14:18:43 -08:00 |
|
Brian Behlendorf
|
cb25e32a1c
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 14:18:38 -08:00 |
|
Brian Behlendorf
|
f4bef22e4e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 14:18:26 -08:00 |
|
Brian Behlendorf
|
03a4aefbcf
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 14:18:25 -08:00 |
|
Brian Behlendorf
|
1e181bcb77
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:17:52 -08:00 |
|
Brian Behlendorf
|
e17f9cb711
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 14:17:50 -08:00 |
|
Brian Behlendorf
|
6b32aaea67
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-09 14:17:49 -08:00 |
|
Brian Behlendorf
|
86eb46d20b
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-09 14:17:49 -08:00 |
|
Brian Behlendorf
|
578c9645df
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-09 14:17:48 -08:00 |
|
Brian Behlendorf
|
902ce659b0
|
Fix c90 compliance issue
|
2009-01-09 14:15:56 -08:00 |
|
Brian Behlendorf
|
9f52c74893
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:07:24 -08:00 |
|
Brian Behlendorf
|
203d2b01b8
|
Make most of the vfsops conditional on ZPL support
|
2009-01-09 14:02:40 -08:00 |
|
Brian Behlendorf
|
e64d6361f7
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 13:34:48 -08:00 |
|
Brian Behlendorf
|
82d446c832
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-09 13:34:34 -08:00 |
|
Brian Behlendorf
|
b881b78bc9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-09 13:34:10 -08:00 |
|
Brian Behlendorf
|
980384b4bc
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 13:34:05 -08:00 |
|
Brian Behlendorf
|
887409fdc4
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 13:34:01 -08:00 |
|
Brian Behlendorf
|
d3d2ff38e8
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:33:50 -08:00 |
|
Brian Behlendorf
|
8d12e9b274
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 13:33:48 -08:00 |
|
Brian Behlendorf
|
bc5e2d8660
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 13:33:48 -08:00 |
|
Brian Behlendorf
|
bf5a93e1ec
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:33:14 -08:00 |
|
Brian Behlendorf
|
7357c92d76
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 13:33:12 -08:00 |
|
Brian Behlendorf
|
7a7a074d3d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-09 13:33:11 -08:00 |
|
Brian Behlendorf
|
cd5e331e68
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-09 13:33:10 -08:00 |
|
Brian Behlendorf
|
953d302b87
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-01-09 13:33:09 -08:00 |
|
Brian Behlendorf
|
04638ead67
|
Change zpool module name to zfs and update references
|
2009-01-09 13:31:16 -08:00 |
|
Brian Behlendorf
|
ca4fc6ef63
|
Fix cast
|
2009-01-09 13:29:41 -08:00 |
|
Brian Behlendorf
|
68585e71a8
|
Get correct exit prototype
|
2009-01-09 13:28:42 -08:00 |
|
Brian Behlendorf
|
711774c008
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:01:22 -08:00 |
|
Brian Behlendorf
|
f1549b9636
|
Take tsd_* functions out for now, we need it for the ZPL later
|
2009-01-09 12:53:37 -08:00 |
|
Brian Behlendorf
|
0ae94a5f86
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 12:50:45 -08:00 |
|
Brian Behlendorf
|
b77b7a4741
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-09 12:50:10 -08:00 |
|
Brian Behlendorf
|
613eaeb74b
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-09 12:49:14 -08:00 |
|
Brian Behlendorf
|
0963498e86
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 12:49:00 -08:00 |
|
Brian Behlendorf
|
786b3d6b88
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 12:48:49 -08:00 |
|
Brian Behlendorf
|
fb1f1596c7
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 12:48:19 -08:00 |
|
Brian Behlendorf
|
18f3ecb485
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 12:48:17 -08:00 |
|
Brian Behlendorf
|
f5a274607e
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 12:46:56 -08:00 |
|
Brian Behlendorf
|
97ad681fc7
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 12:46:46 -08:00 |
|
Brian Behlendorf
|
129afe3ce8
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-09 12:46:44 -08:00 |
|
Brian Behlendorf
|
b4d27767d8
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-09 12:46:42 -08:00 |
|
Brian Behlendorf
|
b3064162aa
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2009-01-09 12:46:40 -08:00 |
|
Brian Behlendorf
|
cb5fc9440b
|
Remove extra defaults
|
2009-01-09 12:42:27 -08:00 |
|
Brian Behlendorf
|
e2e5e6e16a
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 11:44:49 -08:00 |
|
Brian Behlendorf
|
3bed287e00
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:44:37 -08:00 |
|
Brian Behlendorf
|
37cdc79b95
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 11:44:34 -08:00 |
|
Brian Behlendorf
|
f0f1f7362d
|
Remove invalid tunable
|
2009-01-09 11:42:31 -08:00 |
|
Brian Behlendorf
|
e39cb8adab
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 11:31:53 -08:00 |
|
Brian Behlendorf
|
6b4205fe71
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:31:42 -08:00 |
|
Brian Behlendorf
|
f612969bdf
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 11:31:40 -08:00 |
|
Brian Behlendorf
|
dd50143ea1
|
Add module load/unload entry point hooks and ioctl integration
|
2009-01-09 11:21:59 -08:00 |
|
Brian Behlendorf
|
2f1ba85948
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:17:59 -08:00 |
|
Brian Behlendorf
|
be9f92ecd6
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:17:57 -08:00 |
|
Brian Behlendorf
|
7902b5fdf1
|
Add HAVE_ZVOL wrappers
|
2009-01-09 11:16:01 -08:00 |
|
Brian Behlendorf
|
86a5af4d25
|
Update HAVE_ZPL bits for zfs_ioctl
|
2009-01-09 11:13:22 -08:00 |
|
Brian Behlendorf
|
469bd888eb
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 09:23:30 -08:00 |
|
Brian Behlendorf
|
5a04b50177
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-09 09:23:15 -08:00 |
|
Brian Behlendorf
|
8cd72da031
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-09 09:22:49 -08:00 |
|
Brian Behlendorf
|
8bb10f0528
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 09:22:44 -08:00 |
|
Brian Behlendorf
|
00aa3c2f3d
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 09:22:39 -08:00 |
|
Brian Behlendorf
|
1a106f9b4e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 09:22:25 -08:00 |
|
Brian Behlendorf
|
ed92da1e4e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 09:22:24 -08:00 |
|
Brian Behlendorf
|
110393189c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:21:47 -08:00 |
|
Brian Behlendorf
|
a534a8bd1f
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 09:21:36 -08:00 |
|
Brian Behlendorf
|
91b9bf3f40
|
Pulling zvol, zfs_vfsops, and zfs_ioctl to resolve those build issues
|
2009-01-09 09:19:33 -08:00 |
|
Brian Behlendorf
|
b573210ad0
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:28:44 -08:00 |
|
Brian Behlendorf
|
b38c50ac45
|
Update vdev_disk.c implementation to be compatible with b103 API
|
2009-01-08 10:25:23 -08:00 |
|
Brian Behlendorf
|
f1cf255273
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-07 15:53:39 -08:00 |
|
Brian Behlendorf
|
a362b45dc6
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-07 15:53:23 -08:00 |
|
Brian Behlendorf
|
4faa6ff9df
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-07 15:52:56 -08:00 |
|
Brian Behlendorf
|
47f55fd79b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-07 15:52:51 -08:00 |
|
Brian Behlendorf
|
1aab10f3c8
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-07 15:52:46 -08:00 |
|
Brian Behlendorf
|
cf6efb2639
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-07 15:52:32 -08:00 |
|
Brian Behlendorf
|
53a6418874
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-07 15:52:31 -08:00 |
|
Brian Behlendorf
|
1c5ae9851b
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-07 15:51:51 -08:00 |
|
Brian Behlendorf
|
c9ef10893b
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-07 15:51:40 -08:00 |
|
Brian Behlendorf
|
2a76f03369
|
Update distfiles
|
2009-01-07 15:49:36 -08:00 |
|
Brian Behlendorf
|
87313883ac
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-07 15:29:12 -08:00 |
|
Brian Behlendorf
|
12a4048370
|
Enable zfs_create_fs to operate without the VFS
|
2009-01-07 15:26:04 -08:00 |
|
Brian Behlendorf
|
4121b581e9
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-06 13:46:56 -08:00 |
|
Brian Behlendorf
|
d92e9fd833
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-06 13:46:44 -08:00 |
|
Brian Behlendorf
|
d3b387c40c
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-06 13:46:22 -08:00 |
|
Brian Behlendorf
|
29ca9904a1
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-06 13:46:18 -08:00 |
|
Brian Behlendorf
|
7c9a715fdb
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-06 13:46:13 -08:00 |
|
Brian Behlendorf
|
15610133b7
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-06 13:46:03 -08:00 |
|
Brian Behlendorf
|
f01d7c3dba
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-06 13:46:02 -08:00 |
|
Brian Behlendorf
|
b8cb91a93c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:45:31 -08:00 |
|
Brian Behlendorf
|
108e51fa56
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-06 13:45:29 -08:00 |
|
Brian Behlendorf
|
6280843d13
|
Remove until it can be updated
|
2009-01-06 13:43:53 -08:00 |
|
Brian Behlendorf
|
9bfe14aded
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-06 13:17:37 -08:00 |
|
Brian Behlendorf
|
0e01c13ab4
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-06 13:17:24 -08:00 |
|
Brian Behlendorf
|
bf0e564947
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-06 13:17:02 -08:00 |
|
Brian Behlendorf
|
446470c90a
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-06 13:16:58 -08:00 |
|
Brian Behlendorf
|
da6d7ab293
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-06 13:16:53 -08:00 |
|
Brian Behlendorf
|
5f6f39da9a
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-06 13:16:43 -08:00 |
|
Brian Behlendorf
|
74bff69746
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-06 13:16:42 -08:00 |
|
Brian Behlendorf
|
27614e4fe5
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:16:11 -08:00 |
|
Brian Behlendorf
|
ead5766a7a
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-06 13:16:10 -08:00 |
|
Brian Behlendorf
|
f9494f2bb1
|
Build missing sources
|
2009-01-06 13:14:30 -08:00 |
|
Brian Behlendorf
|
d9da5a5c32
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-06 13:01:42 -08:00 |
|
Brian Behlendorf
|
7acfdabf20
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:01:32 -08:00 |
|
Brian Behlendorf
|
63c9f3ff72
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-06 13:01:30 -08:00 |