Brian Behlendorf
|
c351352990
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-11 20:59:46 -07:00 |
|
Brian Behlendorf
|
e0eecbc272
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-11 20:59:45 -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
|
c9323d991b
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-03-11 16:27:48 -07:00 |
|
Brian Behlendorf
|
cfbbf79eeb
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-11 16:27:47 -07:00 |
Ricardo M. Correia
|
8680138968
|
Add missing EXPORT_SYMBOL() macro.
ZFS consumers such as Lustre should have access to these symbols.
|
2009-03-11 16:22:11 -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
|
94dfc4263d
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-03-11 14:11:18 -07:00 |
|
Brian Behlendorf
|
44bbf3d55a
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-11 14:10:41 -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
|
9f76497933
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-11 14:08:53 -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
|
2510eb0d8b
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-03-11 13:25:57 -07:00 |
|
Brian Behlendorf
|
02159c4359
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-11 13:25:24 -07:00 |
|
Brian Behlendorf
|
5915d545e9
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-11 13:25:23 -07:00 |
|
Brian Behlendorf
|
2369dcfc6e
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:23:48 -07:00 |
|
Brian Behlendorf
|
edce9778ba
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-11 13:23:46 -07:00 |
|
Brian Behlendorf
|
4e945fb768
|
Remove -Wno-unknown-pragmas compile option, all unknown pragmas
have been removed by the gcc-ident-pragmas topic branch.
|
2009-03-11 13:14:08 -07:00 |
|
Brian Behlendorf
|
292abc5144
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-03-11 12:45:53 -07:00 |
|
Brian Behlendorf
|
3cfb9e0c7d
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-11 12:45:16 -07:00 |
|
Brian Behlendorf
|
9ceea9faf2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-11 12:45:15 -07:00 |
|
Brian Behlendorf
|
8da11058e7
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:43:34 -07:00 |
|
Brian Behlendorf
|
adf52e68be
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-11 12:43:32 -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
|
86baaa124e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-03-11 12:43:29 -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
|
3cc7a2814d
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-03-11 11:18:23 -07:00 |
|
Brian Behlendorf
|
d402ab0f39
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-11 11:17:38 -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
|
c143e6e5b9
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-11 11:09:18 -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
|
da73d85b15
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-03-11 10:42:43 -07:00 |
|
Brian Behlendorf
|
5f4e78b6cc
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-11 10:42:10 -07:00 |
|
Brian Behlendorf
|
5067076033
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-11 10:42: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
|
1cb08d7cfc
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-11 10:40:34 -07:00 |
|
Brian Behlendorf
|
8eaf19dae8
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-11 10:40:33 -07:00 |