Brian Behlendorf
98660aec20
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 12:32:01 -07:00
Brian Behlendorf
354bebb795
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-04-29 12:31:59 -07:00
Brian Behlendorf
89154c98f9
Update build system to include nvpair_alloc_fixed.c.
2010-04-29 12:24:25 -07:00
Brian Behlendorf
f26fce7b17
Strip ident pragma from module/nvpair/nvpair_alloc_fixed.c
2010-04-29 12:23:12 -07:00
Brian Behlendorf
66ba722b0a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 12:04:36 -07:00
Brian Behlendorf
ff1883382e
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-04-29 12:03:50 -07:00
Brian Behlendorf
8279f80885
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-04-29 12:03:18 -07:00
Brian Behlendorf
3affbe6d7e
Update nvpair's to include nv_alloc_fixed support
2010-04-29 11:59:41 -07:00
Brian Behlendorf
17d368fa5f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 13:17:27 -07:00
Brian Behlendorf
9ad0fef49e
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
...
Conflicts:
module/nvpair/nvpair.c
2009-07-09 13:08:30 -07:00
Brian Behlendorf
683b2f0d00
TopGit missed this update when I updated the same line in the
...
gcc-unused and gcc-uninit topic branches at the same time and
then ran 'tg update'. I'll need to keep that sort of thing
in mind when updating multiple topic branches between updates.
2009-07-09 13:07:05 -07:00
Brian Behlendorf
c4c4afd8fd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 12:23:41 -07:00
Brian Behlendorf
76bf02aebb
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-09 12:23:36 -07:00
Brian Behlendorf
a551134b2f
Unitialized variables should be handled in the gcc-uninit topic branch.
2009-07-09 12:14:56 -07:00
Brian Behlendorf
a19906fe65
Unitialized variables should be handled in the gcc-uninit topic branch.
2009-07-09 12:13:56 -07:00
Brian Behlendorf
0cad1eaf40
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 12:43:30 -07:00
Brian Behlendorf
ced9992186
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-11 12:43:28 -07:00
Brian Behlendorf
fbb2843086
Ensure idx is properly initialized in all instances.
2009-03-11 12:34:24 -07:00
Brian Behlendorf
dff484a388
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 11:09:13 -07:00
Brian Behlendorf
8fe801fd8f
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-03-11 11:00:42 -07:00
Ricardo M. Correia
af45030850
Added 'gcc-ident-pragmas' branch.
2009-03-11 10:59:45 -07:00
Brian Behlendorf
c8e569dd1c
Build system and packaging (RPM support) (Part 2)
...
Complete support for dist install srpm and rpm make targets.
2009-03-10 21:13:30 -07:00
Brian Behlendorf
2a76f03369
Update distfiles
2009-01-07 15:49:36 -08:00
Brian Behlendorf
760d78b9f8
Move default include paths after custom include paths so local stuff gets picked up first
2009-01-05 15:42:56 -08:00
Brian Behlendorf
5a0a9cc451
Update makefiles
2008-12-23 11:47:33 -08:00
Brian Behlendorf
593aa3e10d
Move all current Makefiles to correct locations, updates still needed
2008-12-11 14:55:55 -08:00
Brian Behlendorf
503068ecec
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-11 14:25:32 -08:00
Brian Behlendorf
0595328655
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2008-12-11 14:25:03 -08:00
Brian Behlendorf
82c8f9af50
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-11 14:24:49 -08:00
Brian Behlendorf
a4076c7544
Script updates
2008-12-11 14:21:14 -08:00
Brian Behlendorf
c4911ece24
Move library files to lib
2008-12-11 14:16:55 -08:00
Brian Behlendorf
98ce19f04c
Update avl, nvpair, spl to unique build dirs
2008-12-11 13:54:57 -08:00
Brian Behlendorf
3f25e7cd69
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2008-12-11 11:25:34 -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