Brian Behlendorf
c1d525d6e9
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-02-18 16:20:32 -08:00
Brian Behlendorf
fd9fdb78c6
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-02-18 16:20:30 -08:00
Brian Behlendorf
f07954ef8a
Pass 0's instead of NULL's which are the same but of the correct type
2009-02-18 16:14:20 -08:00
Brian Behlendorf
eb3d5e7051
Local try should be in this patch
2009-02-18 14:47:06 -08:00
Brian Behlendorf
d6821ba8eb
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-02-18 14:36:31 -08:00
Brian Behlendorf
7872d84be6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 14:30:54 -08:00
Brian Behlendorf
87307ab12a
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-02-18 14:30:48 -08:00
Brian Behlendorf
dbc3a5ec55
Merge commit 'refs/top-bases/fix-list' into fix-list
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:29:48 -08:00
Brian Behlendorf
7fe1b71533
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-02-18 14:29:19 -08:00
Brian Behlendorf
404fd8578f
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-02-18 14:28:27 -08:00
Brian Behlendorf
6fe19bd252
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:28:15 -08:00
Brian Behlendorf
3ac1fca8dc
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-02-18 14:27:31 -08:00
Brian Behlendorf
f0a8aedfbc
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:27:12 -08:00
Brian Behlendorf
3eb7fa9afd
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-02-18 14:04:08 -08:00
Brian Behlendorf
32d4d74b04
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-02-18 14:04:04 -08:00
Brian Behlendorf
6fa66816c1
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:03:55 -08:00
Brian Behlendorf
5be9e325a1
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:03:22 -08:00
Brian Behlendorf
ba528721da
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-02-18 13:12:58 -08:00
Brian Behlendorf
0b8e48b813
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-02-18 13:12:53 -08:00
Brian Behlendorf
e203e7b48f
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-02-18 13:12:35 -08:00
Brian Behlendorf
f686a87058
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 13:12:26 -08:00
Brian Behlendorf
3b17164f71
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/vdev.c
module/zfs/zio.c
2009-02-18 13:09:32 -08:00
Brian Behlendorf
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
Brian Behlendorf
cf15da53e5
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-15 16:33:46 -08:00
Brian Behlendorf
fb256294c9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 16:30:29 -08:00
Brian Behlendorf
c5b335f613
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-15 16:30:28 -08:00
Brian Behlendorf
31cddc8a0b
Merge branch 'fix-locks' into refs/top-bases/fix-branch
2009-01-15 16:30:25 -08:00
Brian Behlendorf
50186c2b57
All init and destroy initialized pulled in
2009-01-15 16:25:25 -08:00
Brian Behlendorf
7d4fe54632
txg_init/txg_fini cv_* initialized pulled in upstream in a slightly different way, drop these now redundant versions
2009-01-15 16:22:23 -08:00
Brian Behlendorf
d2f140978a
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-15 15:30:36 -08:00
Brian Behlendorf
8511545409
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 15:29:15 -08:00
Brian Behlendorf
fa36244fba
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 15:29:14 -08:00
Brian Behlendorf
4c0be07ad9
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 15:29:13 -08:00
Brian Behlendorf
22284754e0
Resolve C90 int declared in for() construct
2009-01-15 15:26:54 -08:00
Brian Behlendorf
e08af41a62
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-15 14:53:30 -08:00
Brian Behlendorf
63722ea81a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:52:04 -08:00
Brian Behlendorf
12fb73609c
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 14:52:04 -08:00
Brian Behlendorf
e23dbee181
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 14:52:03 -08:00
Brian Behlendorf
b61295bfb6
Resolve C90 int declared in for() construct
2009-01-15 14:49:42 -08:00
Brian Behlendorf
30cd2af85f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-15 14:39:57 -08:00
Brian Behlendorf
3b6c91ec9f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:38:38 -08:00
Brian Behlendorf
ec41b57eb3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 14:38:38 -08:00
Brian Behlendorf
e9c7a643f1
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 14:38:37 -08:00
Brian Behlendorf
77f365172c
Resolve C90 int declared in for() construct
2009-01-15 14:36:27 -08:00
Brian Behlendorf
99d345ce77
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-15 14:30:29 -08:00
Brian Behlendorf
cb55f9a832
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:29:11 -08:00
Brian Behlendorf
43b4c537eb
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 14:29:10 -08:00
Brian Behlendorf
f969333c73
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 14:29:09 -08:00
Brian Behlendorf
c4fc002c87
Resolve C90 int declared in for() construct
2009-01-15 14:26:52 -08:00
Brian Behlendorf
913ebdb27b
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-15 14:21:42 -08:00
Brian Behlendorf
ddaad20220
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:16:23 -08:00
Brian Behlendorf
27cf20b0d6
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-15 14:16:19 -08:00
Brian Behlendorf
625451acfc
Merge commit 'refs/top-bases/fix-list' into fix-list
2009-01-15 14:16:14 -08:00
Brian Behlendorf
1d3ce40c2e
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-01-15 14:16:09 -08:00
Brian Behlendorf
089836c3e4
Resolve conflict with removed cleaner type
2009-01-15 14:14:57 -08:00
Brian Behlendorf
216ce72418
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-01-15 14:13:46 -08:00
Brian Behlendorf
551838a6c8
Resolve conflict with removed cleaner type
2009-01-15 14:13:39 -08:00
Brian Behlendorf
b633e4f669
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-01-15 14:11:26 -08:00
Brian Behlendorf
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -08:00
Brian Behlendorf
7b54fe44dc
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-15 14:05:38 -08:00
Brian Behlendorf
7aa64936aa
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-01-15 14:05:35 -08:00
Brian Behlendorf
977fef2ba7
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-15 14:05:32 -08:00
Brian Behlendorf
2f36bf5af4
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-01-15 14:05:29 -08:00
Brian Behlendorf
35a269c06c
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-01-15 14:05:26 -08:00
Brian Behlendorf
a2e601c6e3
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-15 14:04:39 -08:00
Brian Behlendorf
3fa768e21b
Resolve conflict with removed cleaner type
2009-01-15 14:04:35 -08:00
Brian Behlendorf
d3df6b2012
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-15 14:01:51 -08:00
Brian Behlendorf
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
Brian Behlendorf
5b86949716
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-13 16:09:05 -08:00
Brian Behlendorf
04d7ae5f22
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 16:06:28 -08:00
Brian Behlendorf
c186f81c6d
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 16:06:26 -08:00
Brian Behlendorf
e1632568f1
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-13 16:06:23 -08:00
Brian Behlendorf
be0b4029db
Initialize list links
2009-01-13 16:02:19 -08:00
Brian Behlendorf
2d0ee71f94
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-13 15:35:15 -08:00
Brian Behlendorf
32baeb1712
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 15:34:01 -08:00
Brian Behlendorf
0d6b81fcca
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 15:34:00 -08:00
Brian Behlendorf
43cd437415
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-13 15:33:59 -08:00
Brian Behlendorf
94944fab96
Fix proper list node initialization
2009-01-13 15:31:58 -08:00
Brian Behlendorf
87fdfc4700
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-13 15:08:22 -08:00
Brian Behlendorf
b14513e826
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 15:07:08 -08:00
Brian Behlendorf
4c31283afc
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 15:07:07 -08:00
Brian Behlendorf
2e9cd667d0
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2009-01-13 15:07:06 -08:00
Brian Behlendorf
fcd2296399
Additional rw_lock not being initialized cleaned in updated code
2009-01-13 15:05:02 -08:00
Brian Behlendorf
642c2b2b4a
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-13 15:03:26 -08:00
Brian Behlendorf
60f5ac8ac7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 15:02:12 -08:00
Brian Behlendorf
4a5bd7a3a8
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 15:02:11 -08:00
Brian Behlendorf
6c96fc31e9
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-13 15:02:10 -08:00
Brian Behlendorf
bec036636e
List cleanup and use of list_node_init initializer
2009-01-13 15:00:12 -08:00
Brian Behlendorf
0e4631fa28
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-13 14:19:27 -08:00
Brian Behlendorf
bdb0ce1a0d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 14:18:11 -08:00
Brian Behlendorf
552c9e1abb
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 14:18:10 -08:00
Brian Behlendorf
c6f1eca44b
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-13 14:18:09 -08:00
Brian Behlendorf
2ea04834bf
Remove assertion for now
2009-01-13 14:16:11 -08:00
Brian Behlendorf
3367de0005
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-13 13:33:45 -08:00
Brian Behlendorf
f8b66dcc4f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 13:32:31 -08:00
Brian Behlendorf
8ad629750e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-13 13:32:30 -08:00
Brian Behlendorf
bb9b10a830
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-13 13:32:29 -08:00
Brian Behlendorf
b73b29ab8e
Fix c90 issue with { }
2009-01-13 13:30:35 -08:00
Brian Behlendorf
7767aca8a1
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-09 14:46:19 -08:00
Brian Behlendorf
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
Brian Behlendorf
ec1b119f9a
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-09 14:19:01 -08:00
Brian Behlendorf
6b32aaea67
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-09 14:17:49 -08:00
Brian Behlendorf
86eb46d20b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-09 14:17:49 -08:00
Brian Behlendorf
578c9645df
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-09 14:17:48 -08:00
Brian Behlendorf
902ce659b0
Fix c90 compliance issue
2009-01-09 14:15:56 -08:00
Brian Behlendorf
d005f86625
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-09 13:34:24 -08:00
Brian Behlendorf
7a7a074d3d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-09 13:33:11 -08:00
Brian Behlendorf
cd5e331e68
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-09 13:33:10 -08:00
Brian Behlendorf
953d302b87
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-01-09 13:33:09 -08:00
Brian Behlendorf
04638ead67
Change zpool module name to zfs and update references
2009-01-09 13:31:16 -08:00
Brian Behlendorf
ca4fc6ef63
Fix cast
2009-01-09 13:29:41 -08:00
Brian Behlendorf
a0c50d8932
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-09 12:49:44 -08:00
Brian Behlendorf
129afe3ce8
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-09 12:46:44 -08:00
Brian Behlendorf
b4d27767d8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-09 12:46:42 -08:00
Brian Behlendorf
b3064162aa
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-01-09 12:46:40 -08:00
Brian Behlendorf
cb5fc9440b
Remove extra defaults
2009-01-09 12:42:27 -08:00
Brian Behlendorf
1ea84d39c0
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-09 09:23:04 -08:00
Brian Behlendorf
91b9bf3f40
Pulling zvol, zfs_vfsops, and zfs_ioctl to resolve those build issues
2009-01-09 09:19:33 -08:00
Brian Behlendorf
44b0019398
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-07 15:53:12 -08:00
Brian Behlendorf
2a76f03369
Update distfiles
2009-01-07 15:49:36 -08:00
Brian Behlendorf
e052f977cf
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-06 13:46:35 -08:00
Brian Behlendorf
6280843d13
Remove until it can be updated
2009-01-06 13:43:53 -08:00
Brian Behlendorf
f956f89e88
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-06 13:17:15 -08:00
Brian Behlendorf
f9494f2bb1
Build missing sources
2009-01-06 13:14:30 -08:00
Brian Behlendorf
802acd05cf
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-06 09:31:02 -08:00
Brian Behlendorf
5f9b0590f5
Remove zfs_fuid for now from kernel source until needed by ZPL
2009-01-06 09:28:09 -08:00
Brian Behlendorf
834679e9d0
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-05 16:40:47 -08:00
Brian Behlendorf
9d4d588938
Comment out until ZPL implemented
2009-01-05 16:34:01 -08:00
Brian Behlendorf
d9fa727559
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-05 15:45:38 -08:00
Brian Behlendorf
760d78b9f8
Move default include paths after custom include paths so local stuff gets picked up first
2009-01-05 15:42:56 -08:00
Brian Behlendorf
a198620e23
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-05 14:29:06 -08:00
Brian Behlendorf
a4ecacdad7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-05 14:28:00 -08:00
Brian Behlendorf
93e72d1102
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-05 14:27:59 -08:00
Brian Behlendorf
854fda6d70
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-01-05 14:27:58 -08:00
Brian Behlendorf
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
Brian Behlendorf
d51fb2c1d6
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-05 12:41:33 -08:00
Brian Behlendorf
ce7115b807
Add unicode makefile references and support
2009-01-05 12:33:09 -08:00
Brian Behlendorf
ced77c2f1b
Add unicode makefile references and support
2009-01-05 12:32:55 -08:00
Brian Behlendorf
e49cbb65ad
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-05 12:12:08 -08:00
Brian Behlendorf
07c6176130
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-05 12:09:06 -08:00
Brian Behlendorf
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
Brian Behlendorf
9e12900ee7
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-01-05 12:08:50 -08:00
Brian Behlendorf
c239bd53d2
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-01-05 12:08:46 -08:00
Brian Behlendorf
65520ad8fd
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2009-01-05 12:08:36 -08:00
Brian Behlendorf
1bee6d83ae
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-01-05 12:08:23 -08:00
Brian Behlendorf
674ed5bd02
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-01-05 12:08:18 -08:00
Brian Behlendorf
91daa17079
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-01-05 12:08:16 -08:00
Brian Behlendorf
39b3a6a12d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-05 12:08:11 -08:00
Brian Behlendorf
600c6efdab
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-05 12:08:07 -08:00
Brian Behlendorf
358ebaae5a
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-01-05 12:08:02 -08:00
Brian Behlendorf
a22f3a712d
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-05 12:07:58 -08:00
Brian Behlendorf
a55b0f2c1b
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-01-05 12:07:53 -08:00
Brian Behlendorf
d09ef994e7
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-01-05 12:07:48 -08:00
Brian Behlendorf
5a7a00f67c
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-05 12:07:30 -08:00
Brian Behlendorf
7d4ccef58f
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-05 12:07:27 -08:00
Brian Behlendorf
cdfd10ba79
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-05 12:07:25 -08:00
Brian Behlendorf
42bcb36c89
Add unicode library
2009-01-05 12:03:23 -08:00
Brian Behlendorf
900ccaf1c1
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-23 13:50:22 -08:00
Brian Behlendorf
de6b729e33
Add Makefile tweak
2008-12-23 13:44:15 -08:00
Brian Behlendorf
29636e23e8
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-23 13:14:04 -08:00
Brian Behlendorf
e7e0111a7c
Update makefile
2008-12-23 13:07:27 -08:00
Brian Behlendorf
650df8eda1
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-23 12:51:35 -08:00
Brian Behlendorf
0dfd5ebee8
module/zcommon/Makefile.in
2008-12-23 12:47:03 -08:00
Brian Behlendorf
6b2ced4447
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-23 11:50:33 -08:00
Brian Behlendorf
5a0a9cc451
Update makefiles
2008-12-23 11:47:33 -08:00
Brian Behlendorf
171df20083
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-22 13:52:37 -08:00
Brian Behlendorf
90e5216ea9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 13:51:17 -08:00
Brian Behlendorf
3b93dc4d82
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 13:51:14 -08:00
Brian Behlendorf
3a953fa870
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2008-12-22 13:51:13 -08:00
Brian Behlendorf
d684390d3a
Just fix a bogus return type
2008-12-22 13:49:15 -08:00
Brian Behlendorf
af113488c1
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-22 11:42:08 -08:00
Brian Behlendorf
7047bb0678
Add missing files from Makefile.am
2008-12-22 11:36:48 -08:00
Brian Behlendorf
1bfbc7e5ba
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-22 10:37:28 -08:00
Brian Behlendorf
10911f9d71
Add missing sources
2008-12-22 10:27:41 -08:00
Brian Behlendorf
29c4d604d3
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-19 16:35:36 -08:00
Brian Behlendorf
96813619bf
Pull in new background scrubber
2008-12-19 16:29:13 -08:00
Brian Behlendorf
0a18cf2a6e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-19 13:48:31 -08:00
Brian Behlendorf
1b2a1a31bb
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 13:47:20 -08:00
Brian Behlendorf
b5e4bf3731
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 13:47:19 -08:00
Brian Behlendorf
8161b781a1
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 13:47:18 -08:00
Brian Behlendorf
89bd2100e7
Resolve a few more c90 issues
2008-12-19 13:45:24 -08:00
Brian Behlendorf
5444e131df
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-19 12:39:35 -08:00
Brian Behlendorf
97818e5e2b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 12:37:17 -08:00
Brian Behlendorf
459f1388ba
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 12:37:15 -08:00
Brian Behlendorf
87810a7c8b
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 12:37:13 -08:00
Brian Behlendorf
93a6c0b0b9
Fix c90 for() issue
2008-12-19 12:33:22 -08:00
Brian Behlendorf
549b3839a8
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-19 11:07:05 -08:00
Brian Behlendorf
cc92d6497b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 11:05:49 -08:00
Brian Behlendorf
d67cf69e08
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 11:05:49 -08:00
Brian Behlendorf
893a49fa9a
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 11:05:48 -08:00
Brian Behlendorf
9041f66bad
Fix all instances of for (int i;;) {} that were easily found
2008-12-19 11:03:54 -08:00
Brian Behlendorf
4115212df8
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-19 10:51:21 -08:00
Brian Behlendorf
1db27e736e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:50:09 -08:00
Brian Behlendorf
ead0ea6da5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:50:09 -08:00
Brian Behlendorf
d9b08ad01f
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 10:50:08 -08:00
Brian Behlendorf
66e0d59024
Whoops, add missing j
2008-12-19 10:48:11 -08:00
Brian Behlendorf
a86514b954
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-19 10:37:43 -08:00
Brian Behlendorf
76247cc21d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:36:34 -08:00
Brian Behlendorf
800463b2ef
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:36:33 -08:00
Brian Behlendorf
7e159c86a3
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 10:36:32 -08:00
Brian Behlendorf
294ebb7537
Fix C90 for(int i;;;) compliance issues
2008-12-19 10:34:41 -08:00
Brian Behlendorf
1321ae6247
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-19 10:27:27 -08:00
Brian Behlendorf
e3815b6d3f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:26:18 -08:00
Brian Behlendorf
e312737766
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:26:18 -08:00
Brian Behlendorf
b66929fe90
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-19 10:26:17 -08:00
Brian Behlendorf
5ee6377759
Fix missing void in prototype
2008-12-19 10:24:26 -08:00
Brian Behlendorf
ba3144a196
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 13:53:46 -08:00
Brian Behlendorf
433b5c8023
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:52:17 -08:00
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
283fb597f1
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 13:44:41 -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
6c21e29045
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 13:27:57 -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
054cf705be
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 11:52:48 -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
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
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
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
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
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
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