Brian Behlendorf
|
54587036c1
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-17 12:45:51 -08:00 |
|
Brian Behlendorf
|
a1b865abee
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 12:45:51 -08:00 |
|
Brian Behlendorf
|
da718dd80a
|
Resolve shadow conflict
|
2008-12-17 12:42:17 -08:00 |
|
Brian Behlendorf
|
7881d6e148
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 12:28:37 -08:00 |
|
Brian Behlendorf
|
632a5dc58b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 12:28:36 -08:00 |
|
Brian Behlendorf
|
42752f2339
|
Resolve conflict
|
2008-12-17 12:28:15 -08:00 |
|
Brian Behlendorf
|
5fa2d90840
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 12:23:59 -08:00 |
|
Brian Behlendorf
|
9ef6211ce7
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 12:23:57 -08:00 |
|
Brian Behlendorf
|
c2f792b263
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-17 12:23:56 -08:00 |
|
Brian Behlendorf
|
e2a977c404
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-17 12:23:55 -08:00 |
|
Brian Behlendorf
|
b23299c7db
|
Fix two prototypes in the right place
|
2008-12-17 12:20:20 -08:00 |
|
Brian Behlendorf
|
c0e4b0cc84
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 12:15:49 -08:00 |
|
Brian Behlendorf
|
fe7d776569
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 12:15:47 -08:00 |
|
Brian Behlendorf
|
895bbc24db
|
Refresh context
|
2008-12-17 12:15:21 -08:00 |
|
Brian Behlendorf
|
385d51ad69
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 11:50:42 -08:00 |
|
Brian Behlendorf
|
6a509b3bca
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:50:41 -08:00 |
|
Brian Behlendorf
|
ccb0a865ab
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-17 11:50:40 -08:00 |
|
Brian Behlendorf
|
3719c4146d
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-17 11:50:40 -08:00 |
|
Brian Behlendorf
|
77811f8236
|
Fix prototype
|
2008-12-17 11:48:40 -08:00 |
|
Brian Behlendorf
|
214494eec6
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 11:37:02 -08:00 |
|
Brian Behlendorf
|
5faa65c02f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 11:37:02 -08:00 |
|
Brian Behlendorf
|
3cf4e51b1c
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 11:36:55 -08:00 |
|
Brian Behlendorf
|
5ea99efac7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 11:36:20 -08:00 |
|
Brian Behlendorf
|
bad0d9a316
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-17 11:36:19 -08:00 |
|
Brian Behlendorf
|
676ab35598
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:36:19 -08:00 |
|
Brian Behlendorf
|
0106dabb11
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-17 11:36:18 -08:00 |
|
Brian Behlendorf
|
a681d70e28
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:36:17 -08:00 |
|
Brian Behlendorf
|
5b9d98bf21
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-17 11:36:16 -08:00 |
|
Brian Behlendorf
|
e532f6bef4
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 11:36:16 -08:00 |
|
Brian Behlendorf
|
8af904a4b0
|
Resolve index shadowing /usr/include/string.h:304
|
2008-12-17 11:34:19 -08:00 |
|
Brian Behlendorf
|
ed9a35324d
|
Not sure why Sun needed to remove these externs, but I need them back
|
2008-12-17 11:32:47 -08:00 |
|
Brian Behlendorf
|
45ae430ddb
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 11:28:03 -08:00 |
|
Brian Behlendorf
|
7927895d37
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 11:28:02 -08:00 |
|
Brian Behlendorf
|
5cbfff3589
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 11:27:55 -08:00 |
|
Brian Behlendorf
|
25db7e9413
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 11:27:21 -08:00 |
|
Brian Behlendorf
|
935fd6c681
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:27:20 -08:00 |
|
Brian Behlendorf
|
d0e6950dd1
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-17 11:27:20 -08:00 |
|
Brian Behlendorf
|
55c8582174
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 11:27:19 -08:00 |
|
Brian Behlendorf
|
dcf0fb9ffb
|
Resolve shadow conflicts
|
2008-12-17 11:25:21 -08:00 |
|
Brian Behlendorf
|
2266aeea13
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 11:17:58 -08:00 |
|
Brian Behlendorf
|
26daaf553f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 11:17:57 -08:00 |
|
Brian Behlendorf
|
6f2638f7a3
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 11:17:50 -08:00 |
|
Brian Behlendorf
|
7973e77bfc
|
Re-add zpool (part of it), we need to build it for the common bits
|
2008-12-17 11:12:06 -08:00 |
|
Brian Behlendorf
|
74b4ee4211
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 10:20:58 -08:00 |
|
Brian Behlendorf
|
09b0ae1b6a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 10:20:57 -08:00 |
|
Brian Behlendorf
|
47fc5596c4
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 10:20:50 -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 |