Brian Behlendorf
|
e253951a7d
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 16:22:34 -08:00 |
|
Brian Behlendorf
|
0ecc4098f5
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:22:28 -08:00 |
|
Brian Behlendorf
|
4a42b6b4a6
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 16:22:24 -08:00 |
|
Brian Behlendorf
|
50b40bf715
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:22:18 -08:00 |
|
Brian Behlendorf
|
7944353976
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 16:22:14 -08:00 |
|
Brian Behlendorf
|
d8a7e60bda
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:22:08 -08:00 |
|
Brian Behlendorf
|
d1b938301b
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 16:22:05 -08:00 |
|
Brian Behlendorf
|
abe5fe302a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 16:22:03 -08:00 |
|
Brian Behlendorf
|
48c9c66032
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:21:55 -08:00 |
|
Brian Behlendorf
|
ff4d8d7323
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-17 16:21:53 -08:00 |
|
Brian Behlendorf
|
9b81f9448f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 16:21:51 -08:00 |
|
Brian Behlendorf
|
9196d77597
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:21:41 -08:00 |
|
Brian Behlendorf
|
908d676952
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-17 16:21:37 -08:00 |
|
Brian Behlendorf
|
fc262c75d0
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:21:32 -08:00 |
|
Brian Behlendorf
|
153ab3eab4
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-17 16:21:29 -08:00 |
|
Brian Behlendorf
|
f1caa738b7
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:21:22 -08:00 |
|
Brian Behlendorf
|
9f0699cc55
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 16:21:18 -08:00 |
|
Brian Behlendorf
|
271f863698
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:21:11 -08:00 |
|
Brian Behlendorf
|
eb5fa23261
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 16:21:07 -08:00 |
|
Brian Behlendorf
|
6c64fc1aee
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:21:00 -08:00 |
|
Brian Behlendorf
|
cf03a9cd90
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 16:20:57 -08:00 |
|
Brian Behlendorf
|
ad3355b72d
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:20:50 -08:00 |
|
Brian Behlendorf
|
1dbd9da54c
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-17 16:20:47 -08:00 |
|
Brian Behlendorf
|
599e4757d3
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:20:40 -08:00 |
|
Brian Behlendorf
|
5f95fd146d
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-17 16:20:35 -08:00 |
|
Brian Behlendorf
|
6481bdc3e7
|
Add -lm linker flag
|
2008-12-17 16:16:22 -08:00 |
|
Brian Behlendorf
|
8b33b8f8cd
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:08:05 -08:00 |
|
Brian Behlendorf
|
0f7520c7b0
|
Add gethrtime
|
2008-12-17 16:04:10 -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
|
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
|
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
|
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
|
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
|
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 |