Brian Behlendorf
|
b5ba75f385
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2010-06-14 15:37:03 -07:00 |
|
Brian Behlendorf
|
48bd88f014
|
Update gcc-c90
Additional c90 fixes required due to ZFS update, these include fixing new
places c99 specific things have been done and some cleanup of old usage.
|
2010-06-14 15:15:26 -07:00 |
|
Brian Behlendorf
|
e27754d9e8
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Conflicts:
cmd/ztest/ztest.c
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_objset.c
module/zfs/dnode.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
module/zfs/spa_history.c
|
2010-05-28 15:45:38 -07:00 |
|
Brian Behlendorf
|
428870ff73
|
Update core ZFS code from build 121 to build 141.
|
2010-05-28 13:45:14 -07:00 |
|
Brian Behlendorf
|
b99b422796
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-08-18 12:08:58 -07:00 |
|
Brian Behlendorf
|
45d1cae3b8
|
Rebase master to b121
|
2009-08-18 11:43:27 -07:00 |
|
Brian Behlendorf
|
a1ccb00b7e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Conflicts:
cmd/ztest/ztest.c
module/zfs/zil.c
|
2009-07-06 13:11:34 -07:00 |
|
Brian Behlendorf
|
9babb37438
|
Rebase master to b117
|
2009-07-02 15:44:48 -07: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
|
d164b20935
|
Rebase master to b108
|
2009-02-18 12:51:31 -08:00 |
|
Brian Behlendorf
|
da7151a89e
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:11:19 -08:00 |
|
Brian Behlendorf
|
fb5f0bc833
|
Rebase master to b105
|
2009-01-15 13:59:39 -08:00 |
|
Brian Behlendorf
|
756a122d37
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-11 11:25:42 -08:00 |
|
Brian Behlendorf
|
172bb4bd5e
|
Move the world out of /zfs/ and seperate out module build tree
|
2008-12-11 11:08:09 -08:00 |