Brian Behlendorf
4be8cdca38
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:51:24 -08:00
Brian Behlendorf
fe6a073e02
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2008-12-18 11:51:23 -08:00
Brian Behlendorf
cf4b3895f1
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 11:51:23 -08:00
Brian Behlendorf
458a2444c2
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 11:51:22 -08:00
Brian Behlendorf
d957a6c66f
Resolve dnp shadow conflict
2008-12-18 11:49:22 -08:00
Brian Behlendorf
3d73450050
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 11:45:00 -08:00
Brian Behlendorf
d63e6259f6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:43:44 -08:00
Brian Behlendorf
6dc6345ae3
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2008-12-18 11:43:44 -08:00
Brian Behlendorf
b98891bf17
Resolve time conflict
2008-12-18 11:41:30 -08:00
Brian Behlendorf
c17037eb8d
Revert commit_cb feature
2008-12-18 11:40:12 -08:00
Brian Behlendorf
58645698b4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:34:26 -08:00
Brian Behlendorf
9ae2c70438
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2008-12-18 11:34:25 -08:00
Brian Behlendorf
625fac6664
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 11:34:24 -08:00
Brian Behlendorf
053a2fffcf
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2008-12-18 11:34:24 -08:00
Brian Behlendorf
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
Brian Behlendorf
1dffab4002
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 11:26:06 -08:00
Brian Behlendorf
2ef6ae9654
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:24:42 -08:00
Brian Behlendorf
d431498139
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 11:24:41 -08:00
Brian Behlendorf
17ac467bf0
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2008-12-18 11:24:40 -08:00
Brian Behlendorf
22f122e505
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 11:24:40 -08:00
Brian Behlendorf
50b70a0c9a
Resolve time conflict
2008-12-18 11:22:39 -08:00
Brian Behlendorf
3fa5220373
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 10:07:21 -08:00
Brian Behlendorf
5c7ee1347b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 10:06:01 -08:00
Brian Behlendorf
c00d7dde6d
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2008-12-18 10:06:00 -08:00
Brian Behlendorf
012ce813df
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2008-12-18 10:06:00 -08:00
Brian Behlendorf
e4d1734eb1
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 10:05:59 -08:00
Brian Behlendorf
432399da0f
Add dropping written variable declaration
2008-12-18 10:03:57 -08:00
Brian Behlendorf
80ce7621bc
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 10:03:01 -08:00
Brian Behlendorf
0a353443cd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 10:01:41 -08:00
Brian Behlendorf
9c0846462b
Resolve conflict
2008-12-18 10:01:37 -08:00
Brian Behlendorf
c501496c0e
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2008-12-18 10:00:47 -08:00
Brian Behlendorf
4df7b421a1
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-18 10:00:46 -08:00
Brian Behlendorf
25a3fca866
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 10:00:45 -08:00
Brian Behlendorf
fef6bef576
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2008-12-18 10:00:44 -08:00
Brian Behlendorf
9e195d0cbf
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-18 10:00:44 -08:00
Brian Behlendorf
c8f253cda8
Now fixed in fix-pthreads branch
2008-12-18 09:58:42 -08:00
Brian Behlendorf
229aba2943
Properly cast thread functions for pthreads
2008-12-18 09:56:22 -08:00
Brian Behlendorf
893ed2fad0
Properly cast thread functions for pthreads
2008-12-18 09:56:05 -08:00
Brian Behlendorf
d7f107e21a
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 09:06:39 -08:00
Brian Behlendorf
6b7c775e09
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 09:05:11 -08:00
Brian Behlendorf
06c9438f79
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 09:05:10 -08:00
Brian Behlendorf
b47c472389
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2008-12-18 09:05:09 -08:00
Brian Behlendorf
cfc42cf0ab
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 09:05:09 -08:00
Brian Behlendorf
0392342e3d
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-18 09:05:08 -08:00
Brian Behlendorf
c37308fc20
Resolve stat conflict with stat()
2008-12-18 09:03:02 -08:00
Brian Behlendorf
d1684019b4
Move int out of for construct for c90 compliance
2008-12-18 09:01:48 -08:00
Brian Behlendorf
a836fda189
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-17 17:04:00 -08:00
Brian Behlendorf
53e66eef5a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 17:01:14 -08:00
Brian Behlendorf
6e26929ddf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 17:01:12 -08:00
Brian Behlendorf
206825be85
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2008-12-17 17:01:10 -08:00