6c96fc31e9
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-13 15:02:10 -08:00
bec036636e
List cleanup and use of list_node_init initializer
2009-01-13 15:00:12 -08:00
4ef8421b03
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-13 14:19:13 -08:00
bdb0ce1a0d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 14:18:11 -08:00
552c9e1abb
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 14:18:10 -08:00
c6f1eca44b
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-13 14:18:09 -08:00
2ea04834bf
Remove assertion for now
2009-01-13 14:16:11 -08:00
323f4f67dd
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-13 13:33:31 -08:00
f8b66dcc4f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 13:32:31 -08:00
8ad629750e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-13 13:32:30 -08:00
bb9b10a830
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-13 13:32:29 -08:00
b73b29ab8e
Fix c90 issue with { }
2009-01-13 13:30:35 -08:00
d7e52cccea
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-09 14:46:05 -08:00
ff09d64647
Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches
2009-01-09 14:37:45 -08:00
ccb1f1c5d4
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-09 14:18:47 -08:00
6b32aaea67
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-09 14:17:49 -08:00
86eb46d20b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-09 14:17:49 -08:00
578c9645df
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-09 14:17:48 -08:00
902ce659b0
Fix c90 compliance issue
2009-01-09 14:15:56 -08:00
b881b78bc9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-09 13:34:10 -08:00
7a7a074d3d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-09 13:33:11 -08:00
cd5e331e68
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-09 13:33:10 -08:00
953d302b87
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-01-09 13:33:09 -08:00
04638ead67
Change zpool module name to zfs and update references
2009-01-09 13:31:16 -08:00
ca4fc6ef63
Fix cast
2009-01-09 13:29:41 -08:00
613eaeb74b
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-09 12:49:14 -08:00
129afe3ce8
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-09 12:46:44 -08:00
b4d27767d8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-09 12:46:42 -08:00
b3064162aa
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-01-09 12:46:40 -08:00
cb5fc9440b
Remove extra defaults
2009-01-09 12:42:27 -08:00
8cd72da031
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-09 09:22:49 -08:00
91b9bf3f40
Pulling zvol, zfs_vfsops, and zfs_ioctl to resolve those build issues
2009-01-09 09:19:33 -08:00
b38c50ac45
Update vdev_disk.c implementation to be compatible with b103 API
2009-01-08 10:25:23 -08:00
4faa6ff9df
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-07 15:52:56 -08:00
2a76f03369
Update distfiles
2009-01-07 15:49:36 -08:00
d3b387c40c
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-06 13:46:22 -08:00
6280843d13
Remove until it can be updated
2009-01-06 13:43:53 -08:00
bf0e564947
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-06 13:17:02 -08:00
f9494f2bb1
Build missing sources
2009-01-06 13:14:30 -08:00
37555b8fe3
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-06 09:30:49 -08:00
5f9b0590f5
Remove zfs_fuid for now from kernel source until needed by ZPL
2009-01-06 09:28:09 -08:00
4522c570e8
Add missing prototype
2009-01-06 08:39:45 -08:00
3a1f0dcde1
Refresh prototype due to upstream changes
2009-01-05 16:53:23 -08:00
ef1c43e66f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-05 16:40:14 -08:00
9d4d588938
Comment out until ZPL implemented
2009-01-05 16:34:01 -08:00
bb747a10de
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-05 15:45:25 -08:00
760d78b9f8
Move default include paths after custom include paths so local stuff gets picked up first
2009-01-05 15:42:56 -08:00
a1dc943c32
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-05 14:28:53 -08:00
a4ecacdad7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-05 14:28:00 -08:00
93e72d1102
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-05 14:27:59 -08:00
854fda6d70
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-01-05 14:27:58 -08:00
12ee6d57c8
Avoid using { 0 } assignment because it assume certain things about the condvar and mutex typedefs which may not be true
2009-01-05 14:26:16 -08:00
144eca0e84
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-05 12:41:04 -08:00
ce7115b807
Add unicode makefile references and support
2009-01-05 12:33:09 -08:00
ced77c2f1b
Add unicode makefile references and support
2009-01-05 12:32:55 -08:00
bde3267f84
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-05 12:11:36 -08:00
07c6176130
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-05 12:09:06 -08:00
52bc9eee2b
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-05 12:09:00 -08:00
9e12900ee7
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-01-05 12:08:50 -08:00
c239bd53d2
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-01-05 12:08:46 -08:00
65520ad8fd
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2009-01-05 12:08:36 -08:00
1bee6d83ae
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-01-05 12:08:23 -08:00
674ed5bd02
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-01-05 12:08:18 -08:00
91daa17079
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-01-05 12:08:16 -08:00
39b3a6a12d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-05 12:08:11 -08:00
600c6efdab
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-05 12:08:07 -08:00
358ebaae5a
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-01-05 12:08:02 -08:00
a22f3a712d
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-05 12:07:58 -08:00
a55b0f2c1b
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-01-05 12:07:53 -08:00
d09ef994e7
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-01-05 12:07:48 -08:00
5a7a00f67c
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-05 12:07:30 -08:00
7d4ccef58f
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-05 12:07:27 -08:00
cdfd10ba79
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-05 12:07:25 -08:00
42bcb36c89
Add unicode library
2009-01-05 12:03:23 -08:00
6f596265c6
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-23 13:50:08 -08:00
de6b729e33
Add Makefile tweak
2008-12-23 13:44:15 -08:00
c2f93a61e2
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-23 13:13:51 -08:00
e7e0111a7c
Update makefile
2008-12-23 13:07:27 -08:00
971e4cca83
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-23 12:51:21 -08:00
0dfd5ebee8
module/zcommon/Makefile.in
2008-12-23 12:47:03 -08:00
4f98a245f4
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-23 11:50:19 -08:00
5a0a9cc451
Update makefiles
2008-12-23 11:47:33 -08:00
ddb72e5a3d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-22 13:52:21 -08:00
90e5216ea9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 13:51:17 -08:00
3b93dc4d82
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 13:51:14 -08:00
3a953fa870
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2008-12-22 13:51:13 -08:00
d684390d3a
Just fix a bogus return type
2008-12-22 13:49:15 -08:00
b17c1f4123
Don't make this fatal for userspace
2008-12-22 13:32:19 -08:00
52a84a3394
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-22 11:41:54 -08:00
7047bb0678
Add missing files from Makefile.am
2008-12-22 11:36:48 -08:00
8126ebe55f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-22 10:37:14 -08:00
10911f9d71
Add missing sources
2008-12-22 10:27:41 -08:00
15e778a05c
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 16:35:07 -08:00
96813619bf
Pull in new background scrubber
2008-12-19 16:29:13 -08:00
3aa09f9e0d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 13:48:18 -08:00
1b2a1a31bb
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 13:47:20 -08:00
b5e4bf3731
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 13:47:19 -08:00
8161b781a1
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 13:47:18 -08:00
89bd2100e7
Resolve a few more c90 issues
2008-12-19 13:45:24 -08:00
add6c31eed
Update vdev_disk for in-kernel use
2008-12-19 13:34:38 -08:00
385cabaff9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 12:39:11 -08:00
97818e5e2b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 12:37:17 -08:00
459f1388ba
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 12:37:15 -08:00
87810a7c8b
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 12:37:13 -08:00
93a6c0b0b9
Fix c90 for() issue
2008-12-19 12:33:22 -08:00
a8e7c21ad7
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 11:06:51 -08:00
cc92d6497b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 11:05:49 -08:00
d67cf69e08
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 11:05:49 -08:00
893a49fa9a
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 11:05:48 -08:00
9041f66bad
Fix all instances of for (int i;;) {} that were easily found
2008-12-19 11:03:54 -08:00
0938ee26f9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 10:51:08 -08:00
1db27e736e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:50:09 -08:00
ead0ea6da5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:50:09 -08:00
d9b08ad01f
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 10:50:08 -08:00
66e0d59024
Whoops, add missing j
2008-12-19 10:48:11 -08:00
023d652154
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 10:37:31 -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
27f8780a37
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 10:27:14 -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
63f8023d96
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 13:53:30 -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
5200db236f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 13:44:26 -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
651f0337c4
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 13:27:42 -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
b7bc2d2d19
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 11:52:32 -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
caac73b67d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 11:39:34 -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
bf5db00d71
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 11:25:49 -08:00
2ef6ae9654
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:24:42 -08:00
d431498139
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 11:24:41 -08:00
22f122e505
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 11:24:40 -08:00
50b70a0c9a
Resolve time conflict
2008-12-18 11:22:39 -08:00
b2c4e56a4f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 10:07:06 -08:00
5c7ee1347b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 10:06:01 -08:00
012ce813df
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2008-12-18 10:06:00 -08:00
e4d1734eb1
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 10:05:59 -08:00
432399da0f
Add dropping written variable declaration
2008-12-18 10:03:57 -08:00
e7d8dc3064
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 09:06:25 -08:00
6b7c775e09
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 09:05:11 -08:00
06c9438f79
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 09:05:10 -08:00
cfc42cf0ab
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 09:05:09 -08:00
0392342e3d
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-18 09:05:08 -08:00
c37308fc20
Resolve stat conflict with stat()
2008-12-18 09:03:02 -08:00
d1684019b4
Move int out of for construct for c90 compliance
2008-12-18 09:01:48 -08:00
585fd3e1e9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 17:03:33 -08:00
53e66eef5a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 17:01:14 -08:00
6e26929ddf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 17:01:12 -08:00
420137d529
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 17:01:09 -08:00
194244b80b
Resolve read shadow conflict
2008-12-17 16:57:21 -08:00
9e0a99fda9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 13:11:41 -08:00
07411c1f84
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 13:10:39 -08:00
6ab9c098f1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 13:10:39 -08:00
9842c708fa
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 13:10:38 -08:00
1e3aeaaef1
Resolve shadow conflict
2008-12-17 13:08:39 -08:00
d621c591c9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 13:05:00 -08:00
b5740d86cf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 13:03:57 -08:00
b9fe30002e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 13:03:57 -08:00
e41d37c49d
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 13:03:56 -08:00
fafeacb53f
Resolve shadow conflict
2008-12-17 13:01:56 -08:00
ad58c411bc
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 12:47:47 -08:00
863ec76ff7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 12:45:53 -08:00
941e464645
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 12:45:52 -08:00
a1b865abee
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 12:45:51 -08:00
da718dd80a
Resolve shadow conflict
2008-12-17 12:42:17 -08:00
e885dd3a7d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 12:29:14 -08:00
5fa2d90840
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 12:23:59 -08:00
9ef6211ce7
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 12:23:57 -08:00
e2a977c404
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-17 12:23:55 -08:00
b23299c7db
Fix two prototypes in the right place
2008-12-17 12:20:20 -08:00
3278f7b38d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 12:16:26 -08:00
385d51ad69
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 11:50:42 -08:00
6a509b3bca
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 11:50:41 -08:00
3719c4146d
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-17 11:50:40 -08:00
77811f8236
Fix prototype
2008-12-17 11:48:40 -08:00
a2d1d32c17
move vdev_disk to it's new home
2008-12-11 15:26:36 -08:00
593aa3e10d
Move all current Makefiles to correct locations, updates still needed
2008-12-11 14:55:55 -08:00
503068ecec
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-11 14:25:32 -08:00
f86c85c6a1
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-11 14:25:30 -08:00
4bc4fbeb38
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-11 14:25:29 -08:00
208f59182a
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 14:25:28 -08:00
f1ab230869
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2008-12-11 14:25:23 -08:00
32a5a583a3
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2008-12-11 14:25:22 -08:00
b53201c0ca
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-11 14:25:16 -08:00
78b70a4471
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-12-11 14:25:10 -08:00
1e849d9b3b
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2008-12-11 14:25:08 -08:00
3f688a4bd8
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-12-11 14:25:07 -08:00
b8294b1311
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-11 14:25:05 -08:00
0595328655
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2008-12-11 14:25:03 -08:00
022db7f816
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2008-12-11 14:25:01 -08:00
ec2b4ef2ed
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2008-12-11 14:24:59 -08:00
9af6637db5
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2008-12-11 14:24:57 -08:00
c325ac879c
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2008-12-11 14:24:56 -08:00
3e2988aa8b
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2008-12-11 14:24:50 -08:00
82c8f9af50
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-11 14:24:49 -08:00
9b3c631dbd
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-12-11 14:24:48 -08:00
a4076c7544
Script updates
2008-12-11 14:21:14 -08:00
c4911ece24
Move library files to lib
2008-12-11 14:16:55 -08:00
98ce19f04c
Update avl, nvpair, spl to unique build dirs
2008-12-11 13:54:57 -08:00
e1694cfaec
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-11 11:27:18 -08:00
8aad84f781
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-11 11:27:12 -08:00
e152d6e601
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 11:27:10 -08:00
d50467b370
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2008-12-11 11:26:54 -08:00
206ceddde8
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2008-12-11 11:26:49 -08:00
f421307e1b
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-11 11:26:25 -08:00
fc3c415441
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-12-11 11:26:02 -08:00
84e65c5c1e
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2008-12-11 11:25:50 -08:00
d00b912ed9
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-12-11 11:25:48 -08:00
756a122d37
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-11 11:25:42 -08:00
3f25e7cd69
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2008-12-11 11:25:34 -08:00
d6ccbb14c5
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2008-12-11 11:25:28 -08:00
ff282a978f
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2008-12-11 11:25:22 -08:00
cdd670cb2f
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2008-12-11 11:25:15 -08:00
8f8ac4288f
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2008-12-11 11:25:09 -08:00
b342e90e44
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2008-12-11 11:24:51 -08:00
4f5d567cfd
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-11 11:24:45 -08:00
3420896332
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-12-11 11:24:42 -08:00
172bb4bd5e
Move the world out of /zfs/ and seperate out module build tree
2008-12-11 11:08:09 -08:00
Brian Behlendorf