Brian Behlendorf
|
9d4d588938
|
Comment out until ZPL implemented
|
2009-01-05 16:34:01 -08:00 |
|
Brian Behlendorf
|
163d99cd44
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 16:00:47 -08:00 |
|
Brian Behlendorf
|
76d40e2e81
|
Update exported symbols
|
2009-01-05 15:58:50 -08:00 |
|
Brian Behlendorf
|
407eef59dd
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 15:45:17 -08:00 |
|
Brian Behlendorf
|
b2db87f254
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 15:45:05 -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
|
4c741b2f9d
|
Revert changes and resolve include issue by adjusting include path ordering
|
2009-01-05 15:40:56 -08:00 |
|
Brian Behlendorf
|
d28280dd17
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 15:21:24 -08:00 |
|
Brian Behlendorf
|
eb58273a29
|
Update exported symbol names for new traversal code
|
2009-01-05 15:19:35 -08:00 |
|
Brian Behlendorf
|
48fa5d6c8f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 14:28:44 -08:00 |
|
Brian Behlendorf
|
ec462ce48f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 14:28:33 -08:00 |
|
Brian Behlendorf
|
a4ecacdad7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-05 14:28:00 -08:00 |
|
Brian Behlendorf
|
93e72d1102
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-05 14:27:59 -08:00 |
|
Brian Behlendorf
|
f2d8d8666a
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-01-05 14:27:59 -08:00 |
|
Brian Behlendorf
|
854fda6d70
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2009-01-05 14:27:58 -08:00 |
|
Brian Behlendorf
|
12ee6d57c8
|
Avoid using { 0 } assignment because it assume certain things about the condvar and mutex typedefs which may not be true
|
2009-01-05 14:26:16 -08:00 |
|
Brian Behlendorf
|
fcacccfb25
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 14:13:59 -08:00 |
|
Brian Behlendorf
|
d8f9597730
|
Always include u8_textprep
|
2009-01-05 14:12:03 -08:00 |
|
Brian Behlendorf
|
6efd309371
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 13:59:14 -08:00 |
|
Brian Behlendorf
|
0c9de0c356
|
Linux kernel modularize unicode
|
2009-01-05 13:57:26 -08:00 |
|
Brian Behlendorf
|
a9bfb78b5a
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 13:46:47 -08:00 |
|
Brian Behlendorf
|
3bc01c0326
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 13:46:35 -08:00 |
|
Brian Behlendorf
|
c15fa0ceb0
|
Add include paths
|
2009-01-05 13:44:26 -08:00 |
|
Brian Behlendorf
|
22427a0ada
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 13:16:09 -08:00 |
|
Brian Behlendorf
|
b6423c7d27
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 13:15:58 -08:00 |
|
Brian Behlendorf
|
861ec17294
|
Update libunicode
|
2009-01-05 13:13:50 -08:00 |
|
Brian Behlendorf
|
6ce317a8d5
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 12:40:48 -08:00 |
|
Brian Behlendorf
|
9c2bf69ecb
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 12:40:25 -08:00 |
|
Brian Behlendorf
|
ce7115b807
|
Add unicode makefile references and support
|
2009-01-05 12:33:09 -08:00 |
|
Brian Behlendorf
|
ced77c2f1b
|
Add unicode makefile references and support
|
2009-01-05 12:32:55 -08:00 |
|
Brian Behlendorf
|
3ee9de49fe
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 12:11:12 -08:00 |
|
Brian Behlendorf
|
1c1ec8cce6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 12:10:37 -08:00 |
|
Brian Behlendorf
|
07c6176130
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-05 12:09:06 -08:00 |
|
Brian Behlendorf
|
1a26b866ef
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2009-01-05 12:09:04 -08:00 |
|
Brian Behlendorf
|
596fa26882
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-01-05 12:09:03 -08:00 |
|
Brian Behlendorf
|
7641911aec
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2009-01-05 12:09:01 -08:00 |
|
Brian Behlendorf
|
52bc9eee2b
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2009-01-05 12:09:00 -08:00 |
|
Brian Behlendorf
|
5da5d30ced
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-05 12:08:57 -08:00 |
|
Brian Behlendorf
|
7a187ce223
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-05 12:08:55 -08:00 |
|
Brian Behlendorf
|
b5d83ce4f0
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2009-01-05 12:08:54 -08:00 |
|
Brian Behlendorf
|
5e814ba757
|
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
|
2009-01-05 12:08:53 -08:00 |
|
Brian Behlendorf
|
343b70ccce
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2009-01-05 12:08:51 -08:00 |
|
Brian Behlendorf
|
9e12900ee7
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2009-01-05 12:08:50 -08:00 |
|
Brian Behlendorf
|
aaaab8b859
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2009-01-05 12:08:47 -08:00 |
|
Brian Behlendorf
|
c239bd53d2
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2009-01-05 12:08:46 -08:00 |
|
Brian Behlendorf
|
50ae8964ac
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2009-01-05 12:08:45 -08:00 |
|
Brian Behlendorf
|
877bda9d38
|
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
|
2009-01-05 12:08:44 -08:00 |
|
Brian Behlendorf
|
3de3d58d01
|
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
|
2009-01-05 12:08:42 -08:00 |
|
Brian Behlendorf
|
347ccb066f
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2009-01-05 12:08:41 -08:00 |
|
Brian Behlendorf
|
592c016da1
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2009-01-05 12:08:39 -08:00 |