Brian Behlendorf
|
c9597f9a4f
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-22 13:51:15 -08:00 |
|
Brian Behlendorf
|
3b93dc4d82
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 13:51:14 -08:00 |
|
Brian Behlendorf
|
c9357d8ef2
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-22 13:51:13 -08:00 |
|
Brian Behlendorf
|
3a953fa870
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-22 13:51:13 -08:00 |
|
Brian Behlendorf
|
d684390d3a
|
Just fix a bogus return type
|
2008-12-22 13:49:15 -08:00 |
|
Brian Behlendorf
|
6bed331e59
|
More compat changes
|
2008-12-22 13:47:58 -08:00 |
|
Brian Behlendorf
|
f41626ced6
|
Make ZPL conditional
|
2008-12-22 13:46:30 -08:00 |
|
Brian Behlendorf
|
c099989076
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-22 13:35:16 -08:00 |
|
Brian Behlendorf
|
9d731b801b
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:35:15 -08:00 |
|
Brian Behlendorf
|
f046fb3552
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:35:14 -08:00 |
|
Brian Behlendorf
|
e9def5f6ab
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:35:13 -08:00 |
|
Brian Behlendorf
|
3f5f22eab0
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 13:35:12 -08:00 |
|
Brian Behlendorf
|
72192de531
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:35:09 -08:00 |
|
Brian Behlendorf
|
a9058c38b3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 13:35:07 -08:00 |
|
Brian Behlendorf
|
9bfe4e627a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 13:35:06 -08:00 |
|
Brian Behlendorf
|
973d4f36ef
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:35:01 -08:00 |
|
Brian Behlendorf
|
3cdde7ffd9
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 13:34:59 -08:00 |
|
Brian Behlendorf
|
46badfb03b
|
Only allow this for the kernel
|
2008-12-22 13:33:06 -08:00 |
|
Brian Behlendorf
|
b17c1f4123
|
Don't make this fatal for userspace
|
2008-12-22 13:32:19 -08:00 |
|
Brian Behlendorf
|
05b4b092dc
|
Only required for ZPL builds
|
2008-12-22 13:31:23 -08:00 |
|
Brian Behlendorf
|
3bbcf6eae6
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-22 12:55:09 -08:00 |
|
Brian Behlendorf
|
76a40e52c1
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:55:08 -08:00 |
|
Brian Behlendorf
|
0789abcd67
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-22 12:55:06 -08:00 |
|
Brian Behlendorf
|
b99cd532bd
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:55:03 -08:00 |
|
Brian Behlendorf
|
46ee012365
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 12:55:01 -08:00 |
|
Brian Behlendorf
|
f107e52c69
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:58 -08:00 |
|
Brian Behlendorf
|
57e03b4986
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-22 12:54:57 -08:00 |
|
Brian Behlendorf
|
2c443043e3
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:53 -08:00 |
|
Brian Behlendorf
|
7a8beb6d17
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 12:54:52 -08:00 |
|
Brian Behlendorf
|
c3baa3c596
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:48 -08:00 |
|
Brian Behlendorf
|
bc90a3635d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 12:54:46 -08:00 |
|
Brian Behlendorf
|
5921e53689
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:43 -08:00 |
|
Brian Behlendorf
|
8716e40726
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 12:54:41 -08:00 |
|
Brian Behlendorf
|
28e4878551
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:38 -08:00 |
|
Brian Behlendorf
|
56f6031652
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-22 12:54:37 -08:00 |
|
Brian Behlendorf
|
f4b61db156
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:33 -08:00 |
|
Brian Behlendorf
|
bdfff917f3
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-22 12:54:32 -08:00 |
|
Brian Behlendorf
|
dcc20bf598
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:28 -08:00 |
|
Brian Behlendorf
|
f05cb28506
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 12:54:26 -08:00 |
|
Brian Behlendorf
|
fbe4b1426c
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:23 -08:00 |
|
Brian Behlendorf
|
a40064cfd1
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 12:54:21 -08:00 |
|
Brian Behlendorf
|
5c285ea211
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:18 -08:00 |
|
Brian Behlendorf
|
b7770e3b13
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 12:54:16 -08:00 |
|
Brian Behlendorf
|
533031e87f
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:13 -08:00 |
|
Brian Behlendorf
|
61afefc4b9
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 12:54:11 -08:00 |
|
Brian Behlendorf
|
d7a1171a54
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 12:54:11 -08:00 |
|
Brian Behlendorf
|
6255b8664c
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:05 -08:00 |
|
Brian Behlendorf
|
18ac7e51ef
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 12:54:04 -08:00 |
|
Brian Behlendorf
|
34f30113a8
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 12:54:03 -08:00 |
|
Brian Behlendorf
|
5d04bb2491
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:53:57 -08:00 |