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
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
cfd9e9936f
Fix an accidentally introduced formatting issue in zfs output.
...
Because the local 'index' variable shadows the index() function
it was replaced by 'i'. Unfortunately when I made this change
I accidentally replaced one instance with 'j' resulting in the
short decimal values being printed incorrectly.
2009-07-31 13:50:21 -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
ebab24f633
Resolve shadow conflict
2008-12-16 16:26:50 -08:00
4d21a1c977
Resolve two more shadow conflicts
2008-12-16 16:14:19 -08:00
3c515284a6
Remove double declaration of char *
2008-12-16 15:49:21 -08:00
53c0cdbc42
Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname
2008-12-16 14:29:35 -08:00
206a3ac58c
Resolve 2 more shadow conflicts
2008-12-16 13:28:23 -08:00
5383875500
Create gcc-shadow branch
2008-12-16 13:19:01 -08:00
172bb4bd5e
Move the world out of /zfs/ and seperate out module build tree
2008-12-11 11:08:09 -08:00
b6097ae55a
Remove stray stub kernel files which should be brought in my linux-kernel-module patch
2008-12-02 08:47:21 -08:00
34dc7c2f25
Initial Linux ZFS GIT Repo
2008-11-20 12:01:55 -08:00
Brian Behlendorf