a0c50d8932
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-09 12:49:44 -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
1ea84d39c0
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-09 09:23:04 -08:00
91b9bf3f40
Pulling zvol, zfs_vfsops, and zfs_ioctl to resolve those build issues
2009-01-09 09:19:33 -08:00
44b0019398
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-07 15:53:12 -08:00
2a76f03369
Update distfiles
2009-01-07 15:49:36 -08:00
e052f977cf
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-06 13:46:35 -08:00
6280843d13
Remove until it can be updated
2009-01-06 13:43:53 -08:00
f956f89e88
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-06 13:17:15 -08:00
f9494f2bb1
Build missing sources
2009-01-06 13:14:30 -08:00
802acd05cf
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-06 09:31:02 -08:00
5f9b0590f5
Remove zfs_fuid for now from kernel source until needed by ZPL
2009-01-06 09:28:09 -08:00
834679e9d0
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-05 16:40:47 -08:00
9d4d588938
Comment out until ZPL implemented
2009-01-05 16:34:01 -08:00
d9fa727559
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-05 15:45:38 -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
a198620e23
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-05 14:29:06 -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
d51fb2c1d6
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-05 12:41:33 -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
e49cbb65ad
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-05 12:12:08 -08:00
07c6176130
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-05 12:09:06 -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
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
a22f3a712d
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-05 12:07:58 -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
900ccaf1c1
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-23 13:50:22 -08:00
de6b729e33
Add Makefile tweak
2008-12-23 13:44:15 -08:00
29636e23e8
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-23 13:14:04 -08:00
e7e0111a7c
Update makefile
2008-12-23 13:07:27 -08:00
650df8eda1
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-23 12:51:35 -08:00
0dfd5ebee8
module/zcommon/Makefile.in
2008-12-23 12:47:03 -08:00
6b2ced4447
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-23 11:50:33 -08:00
5a0a9cc451
Update makefiles
2008-12-23 11:47:33 -08:00
171df20083
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-22 13:52:37 -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
af113488c1
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-22 11:42:08 -08:00
7047bb0678
Add missing files from Makefile.am
2008-12-22 11:36:48 -08:00
1bfbc7e5ba
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-22 10:37:28 -08:00
10911f9d71
Add missing sources
2008-12-22 10:27:41 -08:00
29c4d604d3
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-19 16:35:36 -08:00
96813619bf
Pull in new background scrubber
2008-12-19 16:29:13 -08:00
0a18cf2a6e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-19 13:48:31 -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
5444e131df
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-19 12:39:35 -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
549b3839a8
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-19 11:07:05 -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
4115212df8
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-19 10:51:21 -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
a86514b954
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-19 10:37:43 -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
1321ae6247
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-19 10:27:27 -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
ba3144a196
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 13:53:46 -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
283fb597f1
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 13:44:41 -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
6c21e29045
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 13:27:57 -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
054cf705be
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 11:52:48 -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
c17037eb8d
Revert commit_cb feature
2008-12-18 11:40:12 -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
1dffab4002
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 11:26:06 -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
3fa5220373
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 10:07:21 -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
d7f107e21a
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 09:06:39 -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
a836fda189
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-17 17:04:00 -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
5a8894f159
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-17 13:11:55 -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
7e6cf3d270
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-17 13:05:14 -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
f802338b3c
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-17 12:48:12 -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
Brian Behlendorf