fc490c18b6
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-06-14 14:42:56 -07:00
dd8f6da3da
Update gcc-cast
...
Fix new instances of missing casts or assumed types.
2010-06-14 14:40:10 -07:00
ffaa677995
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/dbuf.c
module/zfs/dsl_dataset.c
2010-05-28 15:38:43 -07:00
3e2be634a5
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
cmd/zdb/zdb.c
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zfs/zfs_util.h
cmd/zinject/zinject.h
cmd/zpool/zpool_main.c
cmd/zpool/zpool_util.c
cmd/ztest/ztest.c
lib/libnvpair/include/libnvpair.h
lib/libnvpair/libnvpair.c
lib/libzfs/libzfs_changelist.c
lib/libzfs/libzfs_config.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_import.c
lib/libzfs/libzfs_mount.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
module/avl/avl.c
module/avl/include/sys/avl.h
module/nvpair/include/sys/nvpair.h
module/nvpair/nvpair.c
module/zcommon/include/zfs_comutil.h
module/zcommon/include/zfs_prop.h
module/zcommon/zfs_comutil.c
module/zfs/arc.c
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dmu_zfetch.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/dsl_synctask.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/dmu_zfetch.h
module/zfs/include/sys/dsl_synctask.h
module/zfs/include/sys/refcount.h
module/zfs/include/sys/txg.h
module/zfs/include/sys/uberblock.h
module/zfs/include/sys/zap_leaf.h
module/zfs/include/sys/zfs_debug.h
module/zfs/include/sys/zfs_znode.h
module/zfs/include/sys/zio_compress.h
module/zfs/include/sys/zvol.h
module/zfs/lzjb.c
module/zfs/metaslab.c
module/zfs/refcount.c
module/zfs/sha256.c
module/zfs/spa.c
module/zfs/spa_boot.c
module/zfs/uberblock.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_replay.c
module/zfs/zio.c
module/zfs/zio_compress.c
2010-05-28 15:34:57 -07:00
d60fc5ca30
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
...
Conflicts:
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/dsl_prop.c
module/zfs/metaslab.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
2010-05-28 15:07:36 -07:00
475bf41d1c
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
...
Conflicts:
cmd/zfs/zfs_main.c
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c
2010-05-28 14:36:18 -07:00
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
354bebb795
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-04-29 12:31:59 -07:00
f26fce7b17
Strip ident pragma from module/nvpair/nvpair_alloc_fixed.c
2010-04-29 12:23:12 -07:00
ff1883382e
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-04-29 12:03:50 -07:00
6edb312559
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-04-29 12:03:45 -07:00
3b12e5a66a
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-04-29 12:03:42 -07:00
b3b5351af0
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-04-29 12:03:20 -07:00
8279f80885
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-04-29 12:03:18 -07:00
c708851b13
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-04-29 12:03:17 -07:00
3affbe6d7e
Update nvpair's to include nv_alloc_fixed support
2010-04-29 11:59:41 -07:00
72de3a8ee1
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-04-29 11:00:44 -07:00
151f424dd8
Strip ident pragma from module/zfs/include/sys/fm/util.h
2010-04-29 10:57:17 -07:00
d91c81c4df
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-04-29 10:41:09 -07:00
a3c2fb2333
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-04-29 10:41:02 -07:00
3bd5ecf4a7
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-04-29 10:41:00 -07:00
d5dbdb4fe2
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-04-29 10:40:38 -07:00
8c24800b72
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-04-29 10:40:36 -07:00
4aad8d3244
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-04-29 10:40:34 -07:00
fa42225a3d
Add Solaris FMA style support
2010-04-29 10:37:15 -07:00
e6f83f6a79
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-01-08 11:39:11 -08:00
cdbe3032eb
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-01-08 11:39:09 -08:00
adb3a3deec
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-01-08 11:39:08 -08:00
8d4f979e7f
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-01-08 11:39:01 -08:00
69804965e9
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-01-08 11:39:00 -08:00
e69572c1b5
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-01-08 11:39:00 -08:00
4cd8e49a69
Add .gitignore files to exclude build products
2010-01-08 11:35:17 -08:00
b76d12a644
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-12-11 12:07:22 -08:00
ba7ccf8ccd
Cast to unsigned long long for 32-bit arches
2009-12-11 11:41:04 -08:00
0f315a58bb
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-11-20 10:29:47 -08:00
3191b962f6
Prevent gcc uninit compiler warning in zfs_range_unlock_reader().
2009-11-20 09:59:58 -08:00
123728d9ae
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2009-11-15 16:26:23 -08:00
4f9acff2d8
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2009-11-15 16:26:20 -08:00
b5e7e8a1de
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-11-15 16:26:17 -08:00
26844cb8e1
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-11-15 16:26:14 -08:00
217998d1a3
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-11-15 16:26:12 -08:00
9d03c28169
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-11-15 16:25:53 -08:00
d8aef5d7bc
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-11-15 16:25:52 -08:00
030d49c262
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-11-15 16:25:50 -08:00
0aa61e8427
Remove zvol.c when updating in update-zfs.sh Linux version available.
2009-11-15 16:20:01 -08:00
ef74bed821
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2009-08-18 14:18:32 -07:00
f3ddd9d082
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-08-18 14:18:32 -07:00
Brian Behlendorf