Brian Behlendorf
|
210f3e716a
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 16:00:34 -08:00 |
|
Brian Behlendorf
|
f459e30c00
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-17 16:00:31 -08:00 |
|
Brian Behlendorf
|
b07886e188
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:00:29 -08:00 |
|
Brian Behlendorf
|
9ab4c93028
|
Wrap more stuff in HAVE_ZPL
|
2008-12-17 15:58:20 -08:00 |
|
Brian Behlendorf
|
35fe8215ef
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 15:35:43 -08:00 |
|
Brian Behlendorf
|
6789f910f6
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-17 15:35:42 -08:00 |
|
Brian Behlendorf
|
9877a35f9f
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 15:35:41 -08:00 |
|
Brian Behlendorf
|
06005641bb
|
Stub out mount/share related func
|
2008-12-17 15:33:45 -08:00 |
|
Brian Behlendorf
|
7278ab4224
|
Refresh autogen products
|
2008-12-17 14:51:43 -08:00 |
|
Brian Behlendorf
|
89494374b0
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 14:36:45 -08:00 |
|
Brian Behlendorf
|
fb51e591f1
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-17 14:36:43 -08:00 |
|
Brian Behlendorf
|
99a4e4a121
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 14:36:43 -08:00 |
|
Brian Behlendorf
|
e3150dafb7
|
Add getexecname to Makefile.am
|
2008-12-17 14:34:48 -08:00 |
|
Brian Behlendorf
|
35ee979e6c
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 14:30:24 -08:00 |
|
Brian Behlendorf
|
df30abba57
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-17 14:30:23 -08:00 |
|
Brian Behlendorf
|
b0fbfcc592
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 14:30:22 -08:00 |
|
Brian Behlendorf
|
3b9d2f075b
|
Fix non-void functions without return
|
2008-12-17 14:28:28 -08:00 |
|
Brian Behlendorf
|
25fdaadeb0
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 14:16:22 -08:00 |
|
Brian Behlendorf
|
de228b9ca7
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-17 14:16:21 -08:00 |
|
Brian Behlendorf
|
6a0d0cbd0f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 14:16:20 -08:00 |
|
Brian Behlendorf
|
8962d81857
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 14:16:19 -08:00 |
|
Brian Behlendorf
|
370f0a1773
|
Add zone and getmntany sources
|
2008-12-17 14:14:23 -08:00 |
|
Brian Behlendorf
|
74999392aa
|
Wrap share/mount with HAVE_ZPL
|
2008-12-17 14:05:47 -08:00 |
|
Brian Behlendorf
|
3ab12400a0
|
Refresh autogen products
|
2008-12-17 13:56:16 -08:00 |
|
Brian Behlendorf
|
e3d7813b7d
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 13:55:29 -08:00 |
|
Brian Behlendorf
|
3eeaecbf8b
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-17 13:55:26 -08:00 |
|
Brian Behlendorf
|
b489784b13
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:55:24 -08:00 |
|
Brian Behlendorf
|
5e62518f68
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 13:55:21 -08:00 |
|
Brian Behlendorf
|
730e97617b
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:55:16 -08:00 |
|
Brian Behlendorf
|
9925cf2aaa
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 13:55:14 -08:00 |
|
Brian Behlendorf
|
4966236d7f
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:55:09 -08:00 |
|
Brian Behlendorf
|
10581d228d
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 13:55:06 -08:00 |
|
Brian Behlendorf
|
a7e80a00d4
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:59 -08:00 |
|
Brian Behlendorf
|
5029749a10
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 13:54:58 -08:00 |
|
Brian Behlendorf
|
6bb3ee33be
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:51 -08:00 |
|
Brian Behlendorf
|
e1cd89d9ca
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 13:54:50 -08:00 |
|
Brian Behlendorf
|
af350a3373
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:44 -08:00 |
|
Brian Behlendorf
|
cc754bd77c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-17 13:54:41 -08:00 |
|
Brian Behlendorf
|
9a1ed84af3
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:36 -08:00 |
|
Brian Behlendorf
|
2115867e0d
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-17 13:54:34 -08:00 |
|
Brian Behlendorf
|
bff6c87152
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:29 -08:00 |
|
Brian Behlendorf
|
b49bc8ff7e
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-17 13:54:26 -08:00 |
|
Brian Behlendorf
|
a1cdc1f4ec
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:21 -08:00 |
|
Brian Behlendorf
|
772de16021
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 13:54:18 -08:00 |
|
Brian Behlendorf
|
9c1f5de77b
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:13 -08:00 |
|
Brian Behlendorf
|
d301978834
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 13:54:11 -08:00 |
|
Brian Behlendorf
|
13f3c7b4af
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:08 -08:00 |
|
Brian Behlendorf
|
720da6c345
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 13:54:06 -08:00 |
|
Brian Behlendorf
|
50c214f76a
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:03 -08:00 |
|
Brian Behlendorf
|
587287f9bf
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 13:54:01 -08:00 |