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
a3c2fb2333
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-04-29 10:41:02 -07:00
fa42225a3d
Add Solaris FMA style support
2010-04-29 10:37:15 -07:00
db89339134
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
...
Conflicts:
module/zfs/dmu.c
2009-08-18 12:07:23 -07:00
45d1cae3b8
Rebase master to b121
2009-08-18 11:43:27 -07:00
244d656e28
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
...
Conflicts:
module/zfs/dmu.c
2009-07-02 16:59:39 -07:00
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
1e3aeaaef1
Resolve shadow conflict
2008-12-17 13:08:39 -08:00
fafeacb53f
Resolve shadow conflict
2008-12-17 13:01:56 -08:00
da718dd80a
Resolve shadow conflict
2008-12-17 12:42:17 -08:00
172bb4bd5e
Move the world out of /zfs/ and seperate out module build tree
2008-12-11 11:08:09 -08:00
Brian Behlendorf