91fcf9d661
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-10 11:51:11 -07:00
9ffbe8f428
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-10 11:51:09 -07:00
97b7f6157a
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-10 11:50:44 -07:00
8a5b47ebb5
Add dmu_write_impl() prototype needed by zpios until a clean
...
zerocopy interface is available.
2009-07-10 11:39:37 -07:00
8bb9b8305a
Export new quota related symbols.
2009-07-10 11:38:53 -07:00
e16ffab302
SPLBUILD now includes modules
2009-07-10 11:37:30 -07:00
925fa57107
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-10 10:52:37 -07:00
df59544928
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-10 10:52:36 -07:00
ca2e8a0a7f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-10 10:52:11 -07:00
4baa59ce44
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-10 10:50:13 -07:00
cfec48619c
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-10 10:50:12 -07:00
1817377ecd
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-07-10 10:50:11 -07:00
84b52133f3
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-10 10:50:10 -07:00
f3c55459b0
Pull ; in to macro to ensure it get's entirely removed, C90 issue.
2009-07-10 10:40:55 -07:00
bfcab44eb7
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-09 15:10:14 -07:00
2ec527b793
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-09 15:10:12 -07:00
f8938a398f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-09 15:09:50 -07:00
24662d61d9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 15:08:06 -07:00
2f4e745a09
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 15:08:04 -07:00
893e11c6be
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-07-09 15:08:03 -07:00
bed14af385
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-07-09 15:08:03 -07:00
ae132945b4
Add suggested paranthesis.
2009-07-09 14:59:10 -07:00
f99ad7f4c3
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-09 13:19:41 -07:00
ebb013f2dd
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-09 13:19:39 -07:00
db193d4ca9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-09 13:19:15 -07:00
17d368fa5f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 13:17:27 -07:00
a3bc97c2c3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 13:17:26 -07:00
947db84a82
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-07-09 13:17:25 -07:00
9ad0fef49e
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
...
Conflicts:
module/nvpair/nvpair.c
2009-07-09 13:08:30 -07:00
683b2f0d00
TopGit missed this update when I updated the same line in the
...
gcc-unused and gcc-uninit topic branches at the same time and
then ran 'tg update'. I'll need to keep that sort of thing
in mind when updating multiple topic branches between updates.
2009-07-09 13:07:05 -07:00
7f3ee7a5ef
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-09 12:26:00 -07:00
e945770943
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-09 12:25:58 -07:00
0c3f631b72
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-09 12:25:32 -07:00
c4c4afd8fd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 12:23:41 -07:00
6db8882b78
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 12:23:39 -07:00
14445eaa8e
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-07-09 12:23:37 -07:00
76bf02aebb
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-09 12:23:36 -07:00
076406cfe3
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-07-09 12:23:35 -07:00
a551134b2f
Unitialized variables should be handled in the gcc-uninit topic branch.
2009-07-09 12:14:56 -07:00
a19906fe65
Unitialized variables should be handled in the gcc-uninit topic branch.
2009-07-09 12:13:56 -07:00
f1d99c0653
Revert to original debugging code and wrap any variabled used only
...
within an ASSERT with the ASSERTV macro which will ensure it will
be removed when the ASSERTs are commented out. This makes gcc much
happier, makes the variables usage explicit, and removes the need
for the compiler to detect it is unused and do the right thing.
2009-07-09 12:10:52 -07:00
2018d0e610
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-09 10:41:54 -07:00
7a724b1db0
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-09 10:41:53 -07:00
64e827d295
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-09 10:41:30 -07:00
e5e94c40f7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 10:39:44 -07:00
aa8ed32ee8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 10:39:43 -07:00
b2eb5a454b
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-07-09 10:39:42 -07:00
9e394e10a9
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-07-09 10:39:41 -07:00
43af29de5f
Type int accidentally not declared at the top of the function.
2009-07-09 10:19:02 -07:00
34cf67f0ed
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-08 16:10:23 -07:00
Brian Behlendorf