Brian Behlendorf
|
27dd5bca77
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 15:36:15 -08:00 |
|
Brian Behlendorf
|
dfddd3290c
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-22 15:36:14 -08:00 |
|
Brian Behlendorf
|
1f19965f10
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 15:36:14 -08:00 |
|
Brian Behlendorf
|
262c2c49c1
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 15:36:13 -08:00 |
|
Brian Behlendorf
|
088c5451b7
|
Add missing include
|
2008-12-22 15:34:18 -08:00 |
|
Brian Behlendorf
|
9b3b373d4f
|
Fix prototypes, why not invalid persay. They use the traditional pre-standard form and were depricated as of C99
|
2008-12-22 15:33:15 -08:00 |
|
Brian Behlendorf
|
858142b6a0
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 14:44:50 -08:00 |
|
Brian Behlendorf
|
86205f8531
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 14:44:49 -08:00 |
|
Brian Behlendorf
|
16d3bec487
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 14:44:42 -08:00 |
|
Brian Behlendorf
|
29b47d366e
|
Remove some headers
|
2008-12-22 14:42:02 -08:00 |
|
Brian Behlendorf
|
8f69262e09
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 13:52:06 -08:00 |
|
Brian Behlendorf
|
c93aec7f64
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 13:52:05 -08:00 |
|
Brian Behlendorf
|
1f72057409
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 13:51:57 -08:00 |
|
Brian Behlendorf
|
90e5216ea9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 13:51:17 -08:00 |
|
Brian Behlendorf
|
c7c77e1279
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-22 13:51:16 -08:00 |
|
Brian Behlendorf
|
035e4d373e
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 13:51:16 -08:00 |
|
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
|
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
|
46badfb03b
|
Only allow this for the kernel
|
2008-12-22 13:33:06 -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
|
34f30113a8
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 12:54:03 -08:00 |
|
Brian Behlendorf
|
121effcbee
|
Pull everything in to the Makefile
|
2008-12-22 12:51:03 -08:00 |
|
Brian Behlendorf
|
b49ce65660
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 11:41:35 -08:00 |
|
Brian Behlendorf
|
fa9a05e496
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 11:41:35 -08:00 |
|
Brian Behlendorf
|
187be3051e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 11:41:27 -08:00 |
|
Brian Behlendorf
|
7403ce6856
|
Add missing Makefile foo
|
2008-12-22 11:38:58 -08:00 |
|
Brian Behlendorf
|
7047bb0678
|
Add missing files from Makefile.am
|
2008-12-22 11:36:48 -08:00 |
|
Brian Behlendorf
|
72aaf61e8a
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 11:30:06 -08:00 |
|
Brian Behlendorf
|
16153aa31d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 11:30:06 -08:00 |
|
Brian Behlendorf
|
b5a525cbf6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 11:29:58 -08:00 |
|
Brian Behlendorf
|
6b1fc7b8ee
|
Add linker flags
|
2008-12-22 11:27:30 -08:00 |
|
Brian Behlendorf
|
356e666729
|
Add linker flags
|
2008-12-22 11:26:16 -08:00 |
|
Brian Behlendorf
|
9fb38f075b
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 11:25:39 -08:00 |
|
Brian Behlendorf
|
24a90ad2c3
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 11:25:38 -08:00 |
|
Brian Behlendorf
|
864a432edd
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-22 11:25:38 -08:00 |
|
Brian Behlendorf
|
34d556babb
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 11:25:37 -08:00 |
|
Brian Behlendorf
|
7c89e6b7d5
|
Fix prototype
|
2008-12-22 11:25:28 -08:00 |
|
Brian Behlendorf
|
72f9288f09
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 11:08:24 -08:00 |
|
Brian Behlendorf
|
d51e1b0eeb
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 11:08:23 -08:00 |
|
Brian Behlendorf
|
13decb5b30
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 11:08:16 -08:00 |
|
Brian Behlendorf
|
feb8953178
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 11:07:39 -08:00 |
|
Brian Behlendorf
|
03a0383581
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-22 11:07:38 -08:00 |
|
Brian Behlendorf
|
b8245db563
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 11:07:38 -08:00 |