Brian Behlendorf
|
9d335bca85
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-08 10:28:47 -08:00 |
|
Brian Behlendorf
|
b457fb49f9
|
Remove vdev_disk from userspace build, vdev_file is used
|
2009-01-08 10:23:59 -08:00 |
|
Brian Behlendorf
|
3cffd4f196
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-07 15:53:01 -08:00 |
|
Brian Behlendorf
|
2a76f03369
|
Update distfiles
|
2009-01-07 15:49:36 -08:00 |
|
Brian Behlendorf
|
0b8e8ad2c4
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-06 13:46:26 -08:00 |
|
Brian Behlendorf
|
6280843d13
|
Remove until it can be updated
|
2009-01-06 13:43:53 -08:00 |
|
Brian Behlendorf
|
791ca841bd
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-06 13:17:06 -08:00 |
|
Brian Behlendorf
|
f9494f2bb1
|
Build missing sources
|
2009-01-06 13:14:30 -08:00 |
|
Brian Behlendorf
|
61032f1ce6
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-06 09:30:54 -08:00 |
|
Brian Behlendorf
|
5f9b0590f5
|
Remove zfs_fuid for now from kernel source until needed by ZPL
|
2009-01-06 09:28:09 -08:00 |
|
Brian Behlendorf
|
fd4be9bb6e
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 16:40:26 -08:00 |
|
Brian Behlendorf
|
9d4d588938
|
Comment out until ZPL implemented
|
2009-01-05 16:34:01 -08:00 |
|
Brian Behlendorf
|
62a048b3a1
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 15:45:29 -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
|
c80dcc2dc1
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 14:28:57 -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
|
97dab5053e
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 13:46:59 -08:00 |
|
Brian Behlendorf
|
c15fa0ceb0
|
Add include paths
|
2009-01-05 13:44:26 -08:00 |
|
Brian Behlendorf
|
b4d633a516
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 13:16:22 -08:00 |
|
Brian Behlendorf
|
861ec17294
|
Update libunicode
|
2009-01-05 13:13:50 -08:00 |
|
Brian Behlendorf
|
9c73332e81
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 12:41:15 -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
|
774375d168
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 12:11:47 -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
|
cc369bb138
|
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
|
2009-01-05 12:08:39 -08:00 |
|
Brian Behlendorf
|
592c016da1
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2009-01-05 12:08:39 -08:00 |
|
Brian Behlendorf
|
fba0f729de
|
Merge branch 'fix-locks' into refs/top-bases/fix-branch
|
2009-01-05 12:08:37 -08:00 |
|
Brian Behlendorf
|
65520ad8fd
|
Merge commit 'refs/top-bases/fix-locks' into fix-locks
|
2009-01-05 12:08:36 -08:00 |
|
Brian Behlendorf
|
cd423f2698
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2009-01-05 12:08:34 -08:00 |