Brian Behlendorf
|
c351352990
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-11 20:59:46 -07:00 |
|
Brian Behlendorf
|
4c042de40b
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-11 20:59:43 -07:00 |
|
Brian Behlendorf
|
60ac8152fe
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-03-11 20:59:42 -07:00 |
|
Brian Behlendorf
|
9915249546
|
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
|
2009-03-11 20:53:11 -07:00 |
|
Brian Behlendorf
|
d4dbc7dca8
|
Resolve all instances of missing braces.
|
2009-03-11 20:52:21 -07:00 |
|
Brian Behlendorf
|
2ba55e86c5
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:58:34 -07:00 |
Ricardo M. Correia
|
db42bfe00a
|
Fixed compilation error due to missing xdr_control() implementation in Linux.
|
2009-03-11 14:53:41 -07:00 |
|
Brian Behlendorf
|
f39adcbb54
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:44:59 -07:00 |
|
Brian Behlendorf
|
76052e446c
|
Revert 'linux-have-xdr' topic branch patch.
This is not needed anymore since a proper XDR implementation was added
to the SPL as of version spl-0.4.3.
|
2009-03-11 14:39:10 -07:00 |
|
Brian Behlendorf
|
962c862580
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-03-11 14:13:07 -07:00 |
|
Brian Behlendorf
|
94dfc4263d
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-03-11 14:11:18 -07:00 |
|
Brian Behlendorf
|
ab760deda7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-11 14:10:39 -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
|
d57bb8312d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:22:30 -07:00 |
|
Brian Behlendorf
|
84b63f7730
|
Remove all #pragma idents from libspl.
|
2009-03-11 12:13:44 -07:00 |
|
Brian Behlendorf
|
3a23753b70
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-03-11 11:20:30 -07:00 |
|
Brian Behlendorf
|
3cc7a2814d
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-03-11 11:18:23 -07:00 |
|
Brian Behlendorf
|
7a08ef9d52
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:
module/zfs/spa_boot.c
|
2009-03-11 11:17:23 -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
|
0c8622c47c
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:55:05 -07:00 |
|
Ricardo M. Correia
|
4a118b6227
|
Minor bug fix due to MAXOFFSET_T constant being too large on 32-bit systems.
|
2009-03-11 10:47:20 -07:00 |
|
Brian Behlendorf
|
2d37cf7361
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-10 22:03:01 -07:00 |
|
Brian Behlendorf
|
c05c1aa6f9
|
Build system and packaging (RPM support) (Part 4)
Complete support for dist install srpm and rpm make targets.
|
2009-03-10 21:57:56 -07:00 |
|
Brian Behlendorf
|
7ca5d85ab6
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-03-10 21:30:24 -07:00 |
|
Brian Behlendorf
|
f65339a529
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-03-10 21:27:34 -07:00 |
|
Brian Behlendorf
|
e610bf6e09
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-10 21:26:59 -07:00 |
|
Brian Behlendorf
|
36860ec1a8
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
module/Makefile.in
|
2009-03-10 21:23:17 -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
|
da2df72c28
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:06:49 -08:00 |
|
Brian Behlendorf
|
2cd31b723e
|
Add HW_HOSTID_LEN for libspl use
|
2009-02-18 16:00:50 -08:00 |
|
Brian Behlendorf
|
5164741b40
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-02-18 15:23:29 -08:00 |
|
Brian Behlendorf
|
03f8c8f94b
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-02-18 15:22:04 -08:00 |
|
Brian Behlendorf
|
b878be0ee1
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-02-18 15:21:35 -08:00 |
|
Brian Behlendorf
|
e60db6f9dd
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-02-18 15:20:14 -08:00 |
|
Brian Behlendorf
|
830ac5b109
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-02-18 15:20:11 -08:00 |
|
Brian Behlendorf
|
6f8f3b5532
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-02-18 15:20:10 -08:00 |
|
Brian Behlendorf
|
9d4d22a26e
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-02-18 15:20:08 -08:00 |
|
Brian Behlendorf
|
8c228734a3
|
Fix cast
|
2009-02-18 15:15:56 -08:00 |
|
Brian Behlendorf
|
181fd4addc
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-02-18 14:37:16 -08:00 |
|
Brian Behlendorf
|
a278e153c4
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-02-18 14:35:20 -08:00 |
|
Brian Behlendorf
|
9f4865e4ca
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-02-18 14:34:45 -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 |