Brian Behlendorf
93bc33a39e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:52:16 -08:00
Brian Behlendorf
23e30eeec9
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:52:15 -08:00
Brian Behlendorf
6cccf01d35
Missed needed drc var
2008-12-18 13:50:12 -08:00
Brian Behlendorf
72d21b338c
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 13:44:31 -08:00
Brian Behlendorf
bab7f42832
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:43:20 -08:00
Brian Behlendorf
5ce7826ab4
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:43:19 -08:00
Brian Behlendorf
732fe6a75f
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:43:19 -08:00
Brian Behlendorf
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
Brian Behlendorf
4adc0464f2
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 13:27:47 -08:00
Brian Behlendorf
1a6091791d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:26:36 -08:00
Brian Behlendorf
8f52e45adf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:26:35 -08:00
Brian Behlendorf
8eccbd95b9
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:26:34 -08:00
Brian Behlendorf
163f096cb6
Resolve remove shadow, rename to rm
2008-12-18 13:24:37 -08:00
Brian Behlendorf
830b60aae2
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 11:52:37 -08:00
Brian Behlendorf
4be8cdca38
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:51:24 -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
a974c42a02
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 11:39:39 -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
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
12c9cecac5
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 11:25:55 -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
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
36198eda31
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 10:07:11 -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
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
9cafa3bbd0
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 09:06:30 -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
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
d15e32bbd2
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-17 17:03:42 -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
420137d529
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 17:01:09 -08:00
Brian Behlendorf
194244b80b
Resolve read shadow conflict
2008-12-17 16:57:21 -08:00
Brian Behlendorf
fb140ade26
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-17 13:11:46 -08:00
Brian Behlendorf
07411c1f84
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 13:10:39 -08:00
Brian Behlendorf
6ab9c098f1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 13:10:39 -08:00
Brian Behlendorf
9842c708fa
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 13:10:38 -08:00
Brian Behlendorf
1e3aeaaef1
Resolve shadow conflict
2008-12-17 13:08:39 -08:00
Brian Behlendorf
a6a5ea8bc2
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-17 13:05:05 -08:00
Brian Behlendorf
b5740d86cf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 13:03:57 -08:00
Brian Behlendorf
b9fe30002e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 13:03:57 -08:00
Brian Behlendorf
e41d37c49d
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 13:03:56 -08:00
Brian Behlendorf
fafeacb53f
Resolve shadow conflict
2008-12-17 13:01:56 -08:00
Brian Behlendorf
f94ea35011
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-17 12:47:55 -08:00
Brian Behlendorf
863ec76ff7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 12:45:53 -08:00
Brian Behlendorf
941e464645
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 12:45:52 -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
f22f1528f5
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-17 12:29:22 -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
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
66cd7d8640
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-17 12:16:37 -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
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
589e125bab
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-11 15:00:10 -08:00
Brian Behlendorf
593aa3e10d
Move all current Makefiles to correct locations, updates still needed
2008-12-11 14:55:55 -08:00
Brian Behlendorf
d02eadea4a
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-11 14:26:44 -08:00
Brian Behlendorf
503068ecec
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-11 14:25:32 -08:00
Brian Behlendorf
4bc4fbeb38
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-11 14:25:29 -08:00
Brian Behlendorf
208f59182a
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 14:25:28 -08:00
Brian Behlendorf
b8294b1311
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-11 14:25:05 -08:00
Brian Behlendorf
022db7f816
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2008-12-11 14:25:01 -08:00
Brian Behlendorf
9af6637db5
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2008-12-11 14:24:57 -08:00
Brian Behlendorf
c325ac879c
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2008-12-11 14:24:56 -08:00
Brian Behlendorf
3e2988aa8b
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2008-12-11 14:24:50 -08:00
Brian Behlendorf
82c8f9af50
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-11 14:24:49 -08:00
Brian Behlendorf
9b3c631dbd
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-12-11 14:24:48 -08:00
Brian Behlendorf
a4076c7544
Script updates
2008-12-11 14:21:14 -08:00
Brian Behlendorf
c4911ece24
Move library files to lib
2008-12-11 14:16:55 -08:00
Brian Behlendorf
4ee70f1453
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-11 14:05:28 -08:00
Brian Behlendorf
98ce19f04c
Update avl, nvpair, spl to unique build dirs
2008-12-11 13:54:57 -08:00
Brian Behlendorf
1f3ed674fc
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-11 11:37:08 -08:00
Brian Behlendorf
8aad84f781
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-11 11:27:12 -08:00
Brian Behlendorf
e152d6e601
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 11:27:10 -08:00
Brian Behlendorf
756a122d37
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-11 11:25:42 -08:00
Brian Behlendorf
d6ccbb14c5
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2008-12-11 11:25:28 -08:00
Brian Behlendorf
cdd670cb2f
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2008-12-11 11:25:15 -08:00
Brian Behlendorf
8f8ac4288f
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2008-12-11 11:25:09 -08:00
Brian Behlendorf
b342e90e44
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2008-12-11 11:24:51 -08:00
Brian Behlendorf
4f5d567cfd
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-11 11:24:45 -08:00
Brian Behlendorf
3420896332
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-12-11 11:24:42 -08:00
Brian Behlendorf
172bb4bd5e
Move the world out of /zfs/ and seperate out module build tree
2008-12-11 11:08:09 -08:00