Brian Behlendorf
|
922f424be6
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-14 14:27:46 -08:00 |
|
Brian Behlendorf
|
fd93449de9
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-14 14:27:31 -08:00 |
|
Brian Behlendorf
|
4fdb04d0a1
|
A little hackery to handle using zdb when the module stack isn't loaded. This is a hack and should be addressed upstream, zdb should not be attempting to initialize services it doesn't need
|
2009-01-14 14:25:25 -08:00 |
|
Brian Behlendorf
|
e972830059
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-14 12:06:46 -08:00 |
|
Brian Behlendorf
|
e6746c2609
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-14 12:06:41 -08:00 |
|
Brian Behlendorf
|
3764ec0e1e
|
Fixed sizeof() issue and minor cleanup
|
2009-01-14 12:03:03 -08:00 |
|
Brian Behlendorf
|
8778a30cda
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-14 10:42:47 -08:00 |
|
Brian Behlendorf
|
97073208f8
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-14 10:42:45 -08:00 |
|
Brian Behlendorf
|
bdde0d9d40
|
Return success here not failure
|
2009-01-14 10:37:35 -08:00 |
|
Brian Behlendorf
|
9716031521
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-13 09:55:44 -08:00 |
|
Brian Behlendorf
|
09b6f64e2d
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-13 09:55:30 -08:00 |
|
Brian Behlendorf
|
ef6d827a88
|
Don't check HAVE_SPL unavailable in userspace build
|
2009-01-13 09:53:35 -08:00 |
|
Brian Behlendorf
|
d68ed9fc41
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-09 16:54:22 -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
|
e22bfeab4e
|
Update load/unload message, mknod /dev/zfs when udev is unavailable
|
2009-01-09 16:50:08 -08:00 |
|
Brian Behlendorf
|
5801f33f50
|
Refresh autogen products
|
2009-01-09 15:12:36 -08:00 |
|
Brian Behlendorf
|
e05d7c1e7e
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-09 15:12:00 -08:00 |
|
Brian Behlendorf
|
402405558a
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 15:11:56 -08:00 |
|
Brian Behlendorf
|
b8fc1110d1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-09 15:11:48 -08:00 |
|
Brian Behlendorf
|
aa6c4ff685
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 15:10:59 -08:00 |
|
Brian Behlendorf
|
522fb18428
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:10:26 -08:00 |
|
Brian Behlendorf
|
6791a1ee34
|
I don't think we need this in userspace
|
2009-01-09 15:07:32 -08:00 |
|
Brian Behlendorf
|
347805ecd8
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-09 14:46:45 -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
|
7af644b8b3
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-09 14:46:32 -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
|
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
|
9855548496
|
Refresh autogen products
|
2009-01-09 11:35:52 -08:00 |
|
Brian Behlendorf
|
2cc958820e
|
Refresh autogen products
|
2009-01-08 10:42:46 -08:00 |
|
Brian Behlendorf
|
62ce1a5d0e
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-08 10:29:29 -08:00 |
|
Brian Behlendorf
|
8a6f0ab272
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-08 10:29:23 -08:00 |
|
Brian Behlendorf
|
eba9726539
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-08 10:29:13 -08:00 |
|
Brian Behlendorf
|
06749d1581
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-08 10:28:18 -08:00 |
|
Brian Behlendorf
|
b7d9adb500
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:27:42 -08:00 |
|
Brian Behlendorf
|
b457fb49f9
|
Remove vdev_disk from userspace build, vdev_file is used
|
2009-01-08 10:23:59 -08:00 |
|
Brian Behlendorf
|
4996278dd4
|
Refresh autogen products
|
2009-01-05 13:48:29 -08:00 |
|
Brian Behlendorf
|
46d1c1ff3d
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-05 13:47:32 -08:00 |
|
Brian Behlendorf
|
77c4ef21ab
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 13:47:29 -08:00 |
|
Brian Behlendorf
|
889bb92210
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-05 13:47:21 -08:00 |
|
Brian Behlendorf
|
3bc01c0326
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 13:46:35 -08:00 |
|
Brian Behlendorf
|
80ed6c342d
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:46:06 -08:00 |
|
Brian Behlendorf
|
c15fa0ceb0
|
Add include paths
|
2009-01-05 13:44:26 -08:00 |
|
Brian Behlendorf
|
9eebf90277
|
Refresh autogen products
|
2009-01-05 13:40:25 -08:00 |
|
Brian Behlendorf
|
1f02aaba1c
|
Refresh autogen products
|
2009-01-05 12:47:00 -08:00 |
|
Brian Behlendorf
|
aaefbb4e76
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-05 12:45:45 -08:00 |
|
Brian Behlendorf
|
35cfc1bb85
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 12:45:38 -08:00 |
|
Brian Behlendorf
|
0f742dfc96
|
Refresh context
|
2009-01-05 12:45:17 -08:00 |
|
Brian Behlendorf
|
9c2bf69ecb
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 12:40:25 -08:00 |
|
Brian Behlendorf
|
9a0cb95b1b
|
Resolve conflict
|
2009-01-05 12:38:23 -08:00 |