7532b57352
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-19 10:37:14 -08:00
fd01bfe6b1
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-19 10:37:13 -08:00
01f8dc1f20
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 10:37:06 -08:00
76247cc21d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:36:34 -08:00
800463b2ef
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:36:33 -08:00
7e159c86a3
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 10:36:32 -08:00
294ebb7537
Fix C90 for(int i;;;) compliance issues
2008-12-19 10:34:41 -08:00
8985e2430d
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-19 10:26:57 -08:00
4ee870c380
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-19 10:26:57 -08:00
f1ba2464f9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 10:26:50 -08:00
e3815b6d3f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:26:18 -08:00
e312737766
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:26:18 -08:00
b66929fe90
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-19 10:26:17 -08:00
5ee6377759
Fix missing void in prototype
2008-12-19 10:24:26 -08:00
f4f6b1f529
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 13:53:09 -08:00
ecb1da0ac8
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 13:53:08 -08:00
ef0739a21d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 13:52:59 -08:00
433b5c8023
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:52:17 -08:00
93bc33a39e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:52:16 -08:00
23e30eeec9
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:52:15 -08:00
6cccf01d35
Missed needed drc var
2008-12-18 13:50:12 -08:00
c513e66884
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 13:44:06 -08:00
360d4841e7
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 13:44:05 -08:00
07901e75cc
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 13:43:58 -08:00
bab7f42832
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:43:20 -08:00
5ce7826ab4
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:43:19 -08:00
732fe6a75f
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:43:19 -08:00
973a9d5a79
Resolve drr shadow by breaking hunk in to a new function, which is just cleaner anyway
2008-12-18 13:41:21 -08:00
a3cbac5278
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 13:27:23 -08:00
a0ba5c46c1
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 13:27:22 -08:00
fea7eb9fe4
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 13:27:14 -08:00
1a6091791d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:26:36 -08:00
8f52e45adf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:26:35 -08:00
8eccbd95b9
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:26:34 -08:00
163f096cb6
Resolve remove shadow, rename to rm
2008-12-18 13:24:37 -08:00
f94274b339
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 11:52:12 -08:00
ec6250d9eb
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 11:52:11 -08:00
5c0f0ca54f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 11:52:03 -08:00
4be8cdca38
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:51:24 -08:00
cf4b3895f1
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 11:51:23 -08:00
458a2444c2
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 11:51:22 -08:00
d957a6c66f
Resolve dnp shadow conflict
2008-12-18 11:49:22 -08:00
60b7c664e0
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 11:39:15 -08:00
8b46ed9359
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 11:39:14 -08:00
bf57b913fb
Revert commit_cb feature
2008-12-18 11:39:02 -08:00
58645698b4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:34:26 -08:00
9ae2c70438
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2008-12-18 11:34:25 -08:00
625fac6664
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 11:34:24 -08:00
63bf9b60d5
Revert changes from this branch so the branch may be removed. We
...
will integrate the latest patch from Sun here once everything is
is basically working. This verion of the patch is out of date
anyone and may not be what is needed.
2008-12-18 11:31:32 -08:00
1321f5a556
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 11:25:28 -08:00
Brian Behlendorf