Brian Behlendorf
|
8cb718a76c
|
Refresh autogen products
|
2009-03-11 14:25:09 -07:00 |
|
Brian Behlendorf
|
3f8174047a
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-03-11 14:13:57 -07:00 |
|
Brian Behlendorf
|
5afc3db3ce
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:08:57 -07:00 |
|
Brian Behlendorf
|
1ca6578ebc
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-11 14:08:51 -07:00 |
|
Brian Behlendorf
|
8a3b1a5ff5
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-03-11 14:08:50 -07:00 |
|
Brian Behlendorf
|
e5011401cd
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2009-03-11 14:08:48 -07:00 |
|
Brian Behlendorf
|
3226eea157
|
Resolve additional cases where gcc wants extra parenthesis.
These were introduced by the rebase to b108.
|
2009-03-11 13:57:47 -07:00 |
|
Brian Behlendorf
|
b8dd7de0b5
|
Refresh autogen products
|
2009-03-11 13:30:38 -07:00 |
|
Brian Behlendorf
|
8927c974cf
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-03-11 11:22:46 -07:00 |
|
Brian Behlendorf
|
bf200630f9
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
module/zfs/rrwlock.c
module/zfs/spa_boot.c
module/zfs/zfs_replay.c
|
2009-03-11 11:12: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
|
5f30a3cb0e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-03-11 11:09:11 -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
|
d8f08a37c1
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-03-11 10:45:09 -07:00 |
|
Brian Behlendorf
|
73c738d1ce
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:40:37 -07:00 |
|
Brian Behlendorf
|
8eaf19dae8
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-11 10:40:33 -07:00 |
|
Brian Behlendorf
|
d43e9ca262
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-03-11 10:40:31 -07:00 |
|
Brian Behlendorf
|
d641369d38
|
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
|
2009-03-11 10:32:45 -07:00 |
|
Ricardo M. Correia
|
fd9a7a0fb4
|
Add 'ull' suffix to 64-bit constants.
|
2009-03-11 10:31:24 -07:00 |
|
Brian Behlendorf
|
e1b736ecc8
|
Refresh autogen products
|
2009-03-10 11:42:01 -07:00 |
|
Brian Behlendorf
|
2c7ad95794
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-02-19 14:57:33 -08:00 |
|
Brian Behlendorf
|
29946892d9
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-02-19 14:57:29 -08:00 |
|
Brian Behlendorf
|
ddfa570f42
|
Initial update to support zpios.sh profiling option.
|
2009-02-19 14:51:40 -08:00 |
|
Brian Behlendorf
|
9c27e585f6
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-02-19 13:58:31 -08:00 |
|
Brian Behlendorf
|
023a02025f
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-02-19 13:58:27 -08:00 |
|
Brian Behlendorf
|
5ae73585fb
|
Cleanup zpios option handling
|
2009-02-19 13:53:17 -08:00 |
|
Brian Behlendorf
|
f951aec719
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-02-19 13:02:05 -08:00 |
|
Brian Behlendorf
|
d3f070026f
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-02-19 13:02:01 -08:00 |
|
Brian Behlendorf
|
23710f1308
|
Minor zpios cleanup plus addition of --nowait feature
|
2009-02-19 12:56:50 -08: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
|
b3d7657ea0
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-02-18 14:37:01 -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
|
f0a8aedfbc
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
|
2009-02-18 14:27:12 -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
|
2b9aadcaf2
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-02-13 12:19:30 -08:00 |
|
Brian Behlendorf
|
6cb1ac2d49
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-02-13 12:19:24 -08:00 |
|
Brian Behlendorf
|
68346c54fe
|
Misnamed --load option sff changed to ssf
|
2009-02-13 12:07:34 -08:00 |
|
Brian Behlendorf
|
b4a92368d2
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-15 15:56:36 -08:00 |
|
Brian Behlendorf
|
4144f1ed75
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-15 15:56:09 -08:00 |
|
Brian Behlendorf
|
20d418a96c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-15 15:54:39 -08:00 |
|
Brian Behlendorf
|
85c77e1c82
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 15:54:35 -08:00 |
|
Brian Behlendorf
|
ee7f10a6b3
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-15 15:54:34 -08:00 |
|
Brian Behlendorf
|
cf9a5530e1
|
Fix pthreads prototype
|
2009-01-15 15:52:12 -08:00 |
|
Brian Behlendorf
|
db5acee33d
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-15 15:42:36 -08:00 |
|
Brian Behlendorf
|
4662f38b69
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-15 15:42:10 -08:00 |
|
Brian Behlendorf
|
de2098cc11
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-15 15:40:42 -08:00 |