Brian Behlendorf
|
c351352990
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-11 20:59:46 -07:00 |
|
Brian Behlendorf
|
9915249546
|
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
|
2009-03-11 20:53:11 -07:00 |
|
Brian Behlendorf
|
d4dbc7dca8
|
Resolve all instances of missing braces.
|
2009-03-11 20:52:21 -07:00 |
|
Brian Behlendorf
|
e60db6f9dd
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-02-18 15:20:14 -08:00 |
|
Brian Behlendorf
|
8c228734a3
|
Fix cast
|
2009-02-18 15:15:56 -08:00 |
|
Brian Behlendorf
|
8090a9a908
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
cmd/zpool/zpool_main.c
|
2009-02-18 14:31:46 -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
|
d164b20935
|
Rebase master to b108
|
2009-02-18 12:51:31 -08:00 |
|
Brian Behlendorf
|
ca804c66f8
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:55:26 -08:00 |
|
Brian Behlendorf
|
7c5b7d2a94
|
This should always be success when zvol support is disabled
|
2009-01-16 14:52:35 -08:00 |
|
Brian Behlendorf
|
476261f2d5
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-15 14:21:18 -08:00 |
|
Brian Behlendorf
|
1f372d9030
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:18:01 -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
|
fb5f0bc833
|
Rebase master to b105
|
2009-01-15 13:59:39 -08:00 |
|
Brian Behlendorf
|
7e43e16395
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:34:50 -08:00 |
|
Brian Behlendorf
|
35f607040f
|
Wrap additional new efi code in HAVE_LIBEFI macros
|
2008-12-16 15:33:00 -08:00 |
|
Brian Behlendorf
|
076f7c6a5f
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 11:36:40 -08:00 |
|
Brian Behlendorf
|
1b0348e335
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-11 11:35:29 -08:00 |
|
Brian Behlendorf
|
aca9d98817
|
Fix conflict
|
2008-12-11 11:34:16 -08:00 |
|
Brian Behlendorf
|
b342e90e44
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-11 11:24:51 -08:00 |
|
Brian Behlendorf
|
4f5d567cfd
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-11 11:24:45 -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 |