Brian Behlendorf
|
5e9be3d254
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 10:20:30 -08:00 |
|
Brian Behlendorf
|
b5df2ce09a
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:20:27 -08:00 |
|
Brian Behlendorf
|
c8990fc37f
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 10:20:25 -08:00 |
|
Brian Behlendorf
|
38b3f7081e
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:20:22 -08:00 |
|
Brian Behlendorf
|
c7dd574d82
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-17 10:20:21 -08:00 |
|
Brian Behlendorf
|
e8fa895f36
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:20:18 -08:00 |
|
Brian Behlendorf
|
c30db8f835
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-17 10:20:16 -08:00 |
|
Brian Behlendorf
|
0209bfd7a4
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 10:20:16 -08:00 |
|
Brian Behlendorf
|
137c1015bd
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 10:20:15 -08:00 |
|
Brian Behlendorf
|
60a0f2e5f8
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-17 10:20:14 -08:00 |
|
Brian Behlendorf
|
d4c1e8b600
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-17 10:20:14 -08:00 |
|
Brian Behlendorf
|
087b2876bb
|
Fix NULL should be 0 usage
|
2008-12-17 10:18:09 -08:00 |
|
Brian Behlendorf
|
3d74e14dda
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 10:12:34 -08:00 |
|
Brian Behlendorf
|
1cf3f6b81e
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-17 10:12:33 -08:00 |
|
Brian Behlendorf
|
5ce03568c6
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:12:32 -08:00 |
|
Brian Behlendorf
|
e23605530a
|
Update #ifndef/#defines
|
2008-12-17 10:10:32 -08:00 |
|
Brian Behlendorf
|
6d524f2906
|
Cleanup some of the #ifndef/#defines
|
2008-12-17 10:06:55 -08:00 |
|
Brian Behlendorf
|
07394c4b64
|
Add mkdev.h rename _SOL_SYS to _LIBSPL_SYS
|
2008-12-17 10:04:04 -08:00 |
|
Brian Behlendorf
|
c889be9749
|
Refresh autogen products
|
2008-12-17 09:55:38 -08:00 |
|
Brian Behlendorf
|
994a616c30
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 09:50:58 -08:00 |
|
Brian Behlendorf
|
a10d9b4e2c
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-17 09:50:56 -08:00 |
|
Brian Behlendorf
|
204ec2e8f4
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:50:56 -08:00 |
|
Brian Behlendorf
|
0b7ef284bd
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:50:55 -08:00 |
|
Brian Behlendorf
|
bcbf74fead
|
Remove assert/verify support from zfs_context, moved to assert.h
|
2008-12-17 09:49:02 -08:00 |
|
Brian Behlendorf
|
5945ae3161
|
Move verify/assert userspace functionality to libspl to simply everything, this way it only lives in one place where you need to build with libzfs.h or zfs_context.h
|
2008-12-17 09:43:11 -08:00 |
|
Brian Behlendorf
|
f7b808da4b
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 09:26:13 -08:00 |
|
Brian Behlendorf
|
5db42a20c3
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-17 09:26:11 -08:00 |
|
Brian Behlendorf
|
a2ed578dee
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:26:10 -08:00 |
|
Brian Behlendorf
|
91e7f37737
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 09:26:09 -08:00 |
|
Brian Behlendorf
|
16deabee3d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:26:06 -08:00 |
|
Brian Behlendorf
|
93f5520dbe
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 09:26:05 -08:00 |
|
Brian Behlendorf
|
3d3f3e0621
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:26:02 -08:00 |
|
Brian Behlendorf
|
f862667bdd
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 09:26:00 -08:00 |
|
Brian Behlendorf
|
48caa9ab19
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:25:57 -08:00 |
|
Brian Behlendorf
|
2e7ed86503
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 09:25:56 -08:00 |
|
Brian Behlendorf
|
d17109de61
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:25:53 -08:00 |
|
Brian Behlendorf
|
215340bb1e
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 09:25:52 -08:00 |
|
Brian Behlendorf
|
22751f023f
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:25:49 -08:00 |
|
Brian Behlendorf
|
9b8134d228
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-17 09:25:47 -08:00 |
|
Brian Behlendorf
|
f81954befe
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:25:44 -08:00 |
|
Brian Behlendorf
|
b4b0ae6975
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-17 09:25:43 -08:00 |
|
Brian Behlendorf
|
5f0f0a5a10
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:25:40 -08:00 |
|
Brian Behlendorf
|
1537b65204
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-17 09:25:39 -08:00 |
|
Brian Behlendorf
|
a1cf33e515
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:25:36 -08:00 |
|
Brian Behlendorf
|
f2fff13c54
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 09:25:35 -08:00 |
|
Brian Behlendorf
|
fee4b2b73a
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:25:31 -08:00 |
|
Brian Behlendorf
|
4fc74e2b6c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 09:25:30 -08:00 |
|
Brian Behlendorf
|
84c5585dac
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:25:27 -08:00 |
|
Brian Behlendorf
|
6b581058c0
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 09:25:26 -08:00 |
|
Brian Behlendorf
|
ad376e4a51
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:25:23 -08:00 |