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
6edb312559
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-04-29 12:03:45 -07:00
3affbe6d7e
Update nvpair's to include nv_alloc_fixed support
2010-04-29 11:59:41 -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
cdbe3032eb
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-01-08 11:39:09 -08:00
4cd8e49a69
Add .gitignore files to exclude build products
2010-01-08 11:35:17 -08:00
b5e7e8a1de
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-11-15 16:26:17 -08:00
0aa61e8427
Remove zvol.c when updating in update-zfs.sh Linux version available.
2009-11-15 16:20:01 -08:00
08f5b3c23d
Required build 121 updates for gcc-shadow
2009-08-18 14:09: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
3eb7fa9afd
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-02-18 14:04:08 -08:00
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
7b54fe44dc
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-15 14:05:38 -08:00
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
600c6efdab
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-05 12:08:07 -08:00
42bcb36c89
Add unicode library
2009-01-05 12:03:23 -08:00
6cccf01d35
Missed needed drc var
2008-12-18 13:50:12 -08:00
973a9d5a79
Resolve drr shadow by breaking hunk in to a new function, which is just cleaner anyway
2008-12-18 13:41:21 -08:00
163f096cb6
Resolve remove shadow, rename to rm
2008-12-18 13:24:37 -08:00
d957a6c66f
Resolve dnp shadow conflict
2008-12-18 11:49:22 -08:00
50b70a0c9a
Resolve time conflict
2008-12-18 11:22:39 -08:00
c37308fc20
Resolve stat conflict with stat()
2008-12-18 09:03:02 -08:00
194244b80b
Resolve read shadow conflict
2008-12-17 16:57:21 -08: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
a4076c7544
Script updates
2008-12-11 14:21:14 -08:00
c4911ece24
Move library files to lib
2008-12-11 14:16:55 -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