Ricardo M. Correia
|
af45030850
|
Added 'gcc-ident-pragmas' branch.
|
2009-03-11 10:59:45 -07:00 |
Brian Behlendorf
|
e1b736ecc8
|
Refresh autogen products
|
2009-03-10 11:42:01 -07:00 |
|
Brian Behlendorf
|
b4028a1bf5
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-02-18 14:38:55 -08:00 |
|
Brian Behlendorf
|
7b8eca908f
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
Conflicts:
cmd/zpool/zpool_main.c
|
2009-02-18 14:38:20 -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
|
7872d84be6
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-02-18 14:30:54 -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
|
3b17164f71
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:
module/zfs/vdev.c
module/zfs/zio.c
|
2009-02-18 13:09:32 -08:00 |
|
Brian Behlendorf
|
d164b20935
|
Rebase master to b108
|
2009-02-18 12:51:31 -08:00 |
|
Brian Behlendorf
|
f863f8f848
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-15 14:22:27 -08:00 |
|
Brian Behlendorf
|
adcb983918
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-15 14:22:14 -08:00 |
|
Brian Behlendorf
|
1f372d9030
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:18:01 -08:00 |
|
Brian Behlendorf
|
ddaad20220
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 14:16:23 -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
|
d3df6b2012
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2009-01-15 14:01:51 -08:00 |
|
Brian Behlendorf
|
fb5f0bc833
|
Rebase master to b105
|
2009-01-15 13:59:39 -08:00 |
|
Brian Behlendorf
|
9855548496
|
Refresh autogen products
|
2009-01-09 11:35:52 -08:00 |
|
Brian Behlendorf
|
1f02aaba1c
|
Refresh autogen products
|
2009-01-05 12:47:00 -08:00 |
|
Brian Behlendorf
|
aaefbb4e76
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-05 12:45:45 -08:00 |
|
Brian Behlendorf
|
35cfc1bb85
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 12:45:38 -08:00 |
|
Brian Behlendorf
|
9a0cb95b1b
|
Resolve conflict
|
2009-01-05 12:38:23 -08:00 |
|
Brian Behlendorf
|
ce7115b807
|
Add unicode makefile references and support
|
2009-01-05 12:33:09 -08:00 |
|
Brian Behlendorf
|
9403f4a605
|
Refresh autogen products
|
2008-12-23 12:39:25 -08:00 |
|
Brian Behlendorf
|
d8c0d57440
|
Refresh autogen products
|
2008-12-23 10:41:37 -08:00 |
|
Brian Behlendorf
|
02d41bf31e
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-22 12:27:04 -08:00 |
|
Brian Behlendorf
|
79491b69f4
|
Start linux-have-zpl layer
|
2008-12-22 12:23:27 -08:00 |
|
Brian Behlendorf
|
08a400676b
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-22 12:09:15 -08:00 |
|
Brian Behlendorf
|
d7d260b870
|
Removing branch to readd under new name
|
2008-12-22 12:05:11 -08:00 |
|
Brian Behlendorf
|
f583bf4e89
|
Refresh autogen products
|
2008-12-22 09:14:09 -08:00 |
|
Brian Behlendorf
|
bca95f1cde
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-22 09:13:31 -08:00 |
|
Brian Behlendorf
|
894c412b86
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 09:12:50 -08:00 |
|
Brian Behlendorf
|
e959b03a8e
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:11:54 -08:00 |
|
Brian Behlendorf
|
cb859a27ba
|
Add librt for clock_gettime
|
2008-12-22 09:06:24 -08:00 |
|
Brian Behlendorf
|
3b465d5229
|
Refresh autogen products
|
2008-12-19 17:05:29 -08:00 |
|
Brian Behlendorf
|
1b6e301a45
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-19 17:05:02 -08:00 |
|
Brian Behlendorf
|
d9965a52fe
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 17:03:38 -08:00 |
|
Brian Behlendorf
|
35336f33ee
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 17:01:54 -08:00 |
|
Brian Behlendorf
|
c8ad9946dc
|
use zlib
|
2008-12-19 16:58:20 -08:00 |
|
Brian Behlendorf
|
3d2e368e7a
|
Refresh autogen products
|
2008-12-19 16:12:00 -08:00 |
|
Brian Behlendorf
|
3da25300e3
|
Refresh autogen products
|
2008-12-18 14:02:22 -08:00 |
|
Brian Behlendorf
|
546961cdc0
|
Add autogen products
|
2008-12-17 16:24:56 -08:00 |
|
Brian Behlendorf
|
3f95673db0
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 16:24:02 -08:00 |
|
Brian Behlendorf
|
e253951a7d
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 16:22:34 -08:00 |
|
Brian Behlendorf
|
599e4757d3
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:20:40 -08:00 |
|
Brian Behlendorf
|
6481bdc3e7
|
Add -lm linker flag
|
2008-12-17 16:16:22 -08:00 |
|
Brian Behlendorf
|
35ee979e6c
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 14:30:24 -08:00 |
|
Brian Behlendorf
|
3b9d2f075b
|
Fix non-void functions without return
|
2008-12-17 14:28:28 -08:00 |
|
Brian Behlendorf
|
25fdaadeb0
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 14:16:22 -08:00 |
|
Brian Behlendorf
|
74999392aa
|
Wrap share/mount with HAVE_ZPL
|
2008-12-17 14:05:47 -08:00 |
|
Brian Behlendorf
|
3ab12400a0
|
Refresh autogen products
|
2008-12-17 13:56:16 -08:00 |
|
Brian Behlendorf
|
e3d7813b7d
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 13:55:29 -08:00 |
|
Brian Behlendorf
|
772de16021
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 13:54:18 -08:00 |
|
Brian Behlendorf
|
9956c32d10
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:53:16 -08:00 |
|
Brian Behlendorf
|
1dfec71003
|
Add -pthreads
|
2008-12-17 13:51:11 -08:00 |
|
Brian Behlendorf
|
3932b368f5
|
Refresh autogen products
|
2008-12-17 11:20:04 -08:00 |
|
Brian Behlendorf
|
38510987aa
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 11:19:30 -08:00 |
|
Brian Behlendorf
|
35257bfbd6
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 11:18:11 -08:00 |
|
Brian Behlendorf
|
746c17afcf
|
Resolve conflict
|
2008-12-17 11:16:41 -08:00 |
|
Brian Behlendorf
|
7973e77bfc
|
Re-add zpool (part of it), we need to build it for the common bits
|
2008-12-17 11:12:06 -08:00 |
|
Brian Behlendorf
|
49aa4dc9a2
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 10:21:50 -08:00 |
|
Brian Behlendorf
|
cf5e58fdf3
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 10:21:11 -08:00 |
|
Brian Behlendorf
|
e8fa895f36
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:20:18 -08:00 |
|
Brian Behlendorf
|
0209bfd7a4
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 10:20:16 -08:00 |
|
Brian Behlendorf
|
d4c1e8b600
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-17 10:20:14 -08:00 |
|
Brian Behlendorf
|
087b2876bb
|
Fix NULL should be 0 usage
|
2008-12-17 10:18:09 -08:00 |
|
Brian Behlendorf
|
c889be9749
|
Refresh autogen products
|
2008-12-17 09:55:38 -08:00 |
|
Brian Behlendorf
|
f7b808da4b
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 09:26:13 -08:00 |
|
Brian Behlendorf
|
f2fff13c54
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 09:25:35 -08:00 |
|
Brian Behlendorf
|
aefe272f78
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:24:43 -08:00 |
|
Brian Behlendorf
|
640c2f8d7e
|
Add missing includes to zfs cmd Makefile.am
|
2008-12-17 09:22:40 -08:00 |
|
Brian Behlendorf
|
d918e8e97d
|
Refresh autogen products
|
2008-12-16 09:12:43 -08:00 |
|
Brian Behlendorf
|
b7374fc81b
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 09:06:51 -08:00 |
|
Brian Behlendorf
|
151ee60cbf
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 09:05:02 -08:00 |
|
Brian Behlendorf
|
3ba34afff8
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:02:49 -08:00 |
|
Brian Behlendorf
|
a7b063d224
|
Add DEFAULT_INCLUDE to rules, adjust = to += accordingly
|
2008-12-16 08:58:41 -08:00 |
|
Brian Behlendorf
|
bffca6c378
|
Refresh autogen products
|
2008-12-15 16:58:02 -08:00 |
|
Brian Behlendorf
|
52de958498
|
Refresh autogen products
|
2008-12-12 12:17:51 -08:00 |
|
Brian Behlendorf
|
7297c6d959
|
Refresh autogen products
|
2008-12-12 10:31:54 -08:00 |
|
Brian Behlendorf
|
609680b177
|
Refresh autogen products
|
2008-12-12 10:20:55 -08:00 |
|
Brian Behlendorf
|
3b4adb0abd
|
Add all autogen products
|
2008-12-12 09:25:06 -08:00 |
|
Brian Behlendorf
|
370d47306c
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 08:53:03 -08:00 |
|
Brian Behlendorf
|
9e66117d33
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:13 -08:00 |
|
Brian Behlendorf
|
d4ae03c700
|
Add initial stub makefile, details need filling in
|
2008-12-12 08:50:07 -08:00 |
|
Brian Behlendorf
|
11e1ce8c2e
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 11:36:50 -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
|
3420896332
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-11 11:24:42 -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 |