957b7b41d4
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
cmd/zdb/zdb.c
cmd/ztest/ztest.c
module/zfs/dbuf.c
module/zfs/dsl_dataset.c
module/zfs/dsl_scrub.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zio.c
2010-05-28 14:19:22 -07:00
428870ff73
Update core ZFS code from build 121 to build 141.
2010-05-28 13:45:14 -07:00
c91169c7c5
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
...
Conflicts:
lib/libzfs/libzfs_util.c
2010-05-28 12:42:27 -07:00
fb72c6ef81
Revert gcc-shadow using -Wno-shadow I can live with
...
While I would rather fix all the instances where something is shadowed
it complicates tracking the OpenSolaris code where they either don't
seem to care or have different conflicts. Anyway, this ends up being
more simply gratutous change than I care for.
2010-05-28 12:34:45 -07:00
fd782ee588
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-05-18 15:00:38 -07:00
acb95dcdce
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2010-05-18 15:00:37 -07:00
0fa7d4da7e
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-05-18 15:00:35 -07:00
9755dc8804
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2010-05-18 15:00:34 -07:00
e7e2da89c8
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-05-18 15:00:32 -07:00
9f211311e8
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-05-18 15:00:32 -07:00
01cf3eb77a
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2010-05-18 15:00:30 -07:00
903d3674d1
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2010-05-18 15:00:28 -07:00
5f1d1a4fba
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2010-05-18 15:00:27 -07:00
ff96dfaacf
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-05-18 15:00:25 -07:00
8c341fb8e5
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-05-18 15:00:24 -07:00
410e9c8755
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-05-18 15:00:23 -07:00
a494a8794e
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-05-18 15:00:21 -07:00
e38df7bbe6
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-05-18 15:00:20 -07:00
891e6e3720
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-05-18 15:00:18 -07:00
83fc7d6c5c
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-05-18 15:00:17 -07:00
5b210a954f
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-05-18 15:00:15 -07:00
e50a0b058f
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-05-18 15:00:13 -07:00
3c014d4617
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-05-18 15:00:12 -07:00
6daf3d3eda
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-05-18 15:00:10 -07:00
6497274bce
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-05-18 15:00:09 -07:00
557e916423
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-05-18 15:00:08 -07:00
ab1c7c0446
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-05-18 15:00:06 -07:00
bbb77ca198
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-05-18 15:00:04 -07:00
8ef9226d8f
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-05-18 15:00:02 -07:00
e9ffbaf18d
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-05-18 15:00:00 -07:00
71eb2bb283
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-05-18 14:59:58 -07:00
0e43115a17
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-05-18 14:59:57 -07:00
6119cb885a
Add AUTHORS to master branch
2010-05-18 14:55:01 -07:00
36cb411075
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-05-18 14:33:07 -07:00
17173476aa
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2010-05-18 14:33:06 -07:00
bd7197fd0b
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-05-18 14:33:04 -07:00
d0680b8155
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2010-05-18 14:33:03 -07:00
a6a29acd23
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-05-18 14:33:01 -07:00
da79ba3c6d
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-05-18 14:33:00 -07:00
6837738a53
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2010-05-18 14:32:58 -07:00
c3902f6ef3
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2010-05-18 14:32:57 -07:00
0bf742359a
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2010-05-18 14:32:55 -07:00
c8da3bb68b
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-05-18 14:32:54 -07:00
cf7a3c4af2
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-05-18 14:32:52 -07:00
02ae622925
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-05-18 14:32:51 -07:00
ddb9f06d75
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-05-18 14:32:49 -07:00
ce10342dd9
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-05-18 14:32:48 -07:00
62c14ca4ca
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-05-18 14:32:46 -07:00
9a8060d6f5
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-05-18 14:32:45 -07:00
91fce49b3b
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-05-18 14:32:43 -07:00
Brian Behlendorf