Brian Behlendorf
|
8fdc6ee079
|
Stub out two more funcs until zpl support exists
|
2008-12-22 10:13:31 -08:00 |
|
Brian Behlendorf
|
8b0a74c863
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:11:31 -08:00 |
|
Brian Behlendorf
|
c72d6b30e8
|
Remove one more header
|
2008-12-22 10:07:53 -08:00 |
|
Brian Behlendorf
|
0ecac4865c
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:03:22 -08:00 |
|
Brian Behlendorf
|
e8b703cb46
|
Add sys/time.h
|
2008-12-22 10:00:01 -08:00 |
|
Brian Behlendorf
|
3ef8f98c50
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:27:39 -08:00 |
|
Brian Behlendorf
|
d8c6c982e6
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 09:27:37 -08:00 |
|
Brian Behlendorf
|
0a376cabd7
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:27:34 -08:00 |
|
Brian Behlendorf
|
6f507a46a1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-22 09:27:33 -08:00 |
|
Brian Behlendorf
|
861cbda056
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:27:30 -08:00 |
|
Brian Behlendorf
|
ea48a9d80a
|
Resolve conflict
|
2008-12-22 09:27:25 -08:00 |
|
Brian Behlendorf
|
e72bd17227
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:26:59 -08:00 |
|
Brian Behlendorf
|
233dda723f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 09:26:58 -08:00 |
|
Brian Behlendorf
|
47d67fd0e5
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:26:55 -08:00 |
|
Brian Behlendorf
|
febd99481b
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 09:26:53 -08:00 |
|
Brian Behlendorf
|
0bae2d733f
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:26:50 -08:00 |
|
Brian Behlendorf
|
0d36e605d1
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-22 09:26:49 -08:00 |
|
Brian Behlendorf
|
e492dd3181
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:26:46 -08:00 |
|
Brian Behlendorf
|
e8cf9a7d8d
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-22 09:26:44 -08:00 |
|
Brian Behlendorf
|
a6411c9b1e
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:26:41 -08:00 |
|
Brian Behlendorf
|
d17d4a5875
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 09:26:39 -08:00 |
|
Brian Behlendorf
|
abb88eac68
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:26:36 -08:00 |
|
Brian Behlendorf
|
d52676f52b
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 09:26:35 -08:00 |
|
Brian Behlendorf
|
1cdad323ca
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:26:31 -08:00 |
|
Brian Behlendorf
|
f1071ac43b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 09:26:30 -08:00 |
|
Brian Behlendorf
|
93df5fbb3f
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:26:27 -08:00 |
|
Brian Behlendorf
|
4e1fe142d3
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 09:26:26 -08:00 |
|
Brian Behlendorf
|
681b849ce0
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:26:22 -08:00 |
|
Brian Behlendorf
|
74797bf41e
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 09:26:21 -08:00 |
|
Brian Behlendorf
|
4b614b4f35
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 09:26:20 -08:00 |
|
Brian Behlendorf
|
8db834ec91
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:26:15 -08:00 |
|
Brian Behlendorf
|
034a93dacb
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 09:26:14 -08:00 |
|
Brian Behlendorf
|
978bee45d8
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 09:26:13 -08:00 |
|
Brian Behlendorf
|
e00fb0ceff
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:26:08 -08:00 |
|
Brian Behlendorf
|
d7a8b2ef6f
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-22 09:26:06 -08:00 |
|
Brian Behlendorf
|
5423e7f82c
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:26:03 -08:00 |
|
Brian Behlendorf
|
4cdb578ceb
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-22 09:26:01 -08:00 |
|
Brian Behlendorf
|
889c606d0e
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:25:58 -08:00 |
|
Brian Behlendorf
|
c60d76734b
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 09:25:57 -08:00 |
|
Brian Behlendorf
|
dd863cac7f
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:25:54 -08:00 |
|
Brian Behlendorf
|
b608990fea
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 09:25:52 -08:00 |
|
Brian Behlendorf
|
12cbd489a8
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:25:49 -08:00 |
|
Brian Behlendorf
|
6263832a14
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-22 09:25:48 -08:00 |
|
Brian Behlendorf
|
0d606b2da4
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:25:45 -08:00 |
|
Brian Behlendorf
|
8b633147e8
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-22 09:25:43 -08:00 |
|
Brian Behlendorf
|
ecf38d314e
|
Resolve conflict
|
2008-12-22 09:25:04 -08:00 |
|
Brian Behlendorf
|
cd11c5157b
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-22 09:24:30 -08:00 |
|
Brian Behlendorf
|
b58e34e0d8
|
Update makefiles
|
2008-12-22 09:22:39 -08:00 |
|
Brian Behlendorf
|
791f719dc0
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:13:29 -08:00 |
|
Brian Behlendorf
|
7577be2acd
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 09:13:27 -08:00 |