0e6b056559
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-03-11 14:08:56 -08:00
feee765f99
Remove promise example config replace with a supermicro config
...
The promise config never worked quite right. I'm replacing it with
a Supermicro config which does and which I've tested on a real test
system.
2010-03-11 14:04:12 -08:00
e7b3766a69
Remove udev dependency when running in-tree
...
After much contemplation I can't see a clean way to use udev entirely
in-tree for testing. This patch removed a horrible horrible hack which
would copy the needed udev bits in to place on your system to make it
work. That however is simply not acceptable, nothing you in in-tree
should ever ever ever install something on your system.
Since I could not come up with a clean way to use udev in-tree. The
fix is to simply parse the zdev config file and create the needed
symlinks in a sub-diretory or your working tree. This is not as clean
as using udev but it does work perfectly well for in-tree testing.
2010-03-11 13:56:20 -08:00
274cd545ce
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-03-11 10:00:41 -08:00
fddf5c888f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-11 09:55:44 -08:00
ce1160b5b9
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-03-11 09:55:43 -08:00
5e4f96bb2f
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-03-11 09:55:42 -08:00
5302158673
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-03-11 09:55:41 -08:00
2269c6aef0
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-03-11 09:55:41 -08:00
7d196935b2
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-03-11 09:55:40 -08:00
389bb5a604
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-03-11 09:55:39 -08:00
a20a614a87
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-03-11 09:55:38 -08:00
db0227bc9e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-03-11 09:55:36 -08:00
59d56028e7
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-03-11 09:55:35 -08:00
858e56fbb4
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-03-11 09:55:34 -08:00
05926244c0
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
2010-03-11 09:55:34 -08:00
c997dd4d16
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-03-11 09:55:33 -08:00
48bf985a0e
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-03-11 09:55:32 -08:00
8fc5cb913d
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-03-11 09:55:31 -08:00
b7391af874
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-03-11 09:55:31 -08:00
05954100ab
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-03-11 09:55:30 -08:00
1e885d5c84
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-03-11 09:55:29 -08:00
3ea7323532
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-03-11 09:55:28 -08:00
bd6129fa56
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-03-11 09:55:28 -08:00
ddb181cb53
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-03-11 09:55:27 -08:00
8a80550731
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-03-11 09:55:26 -08:00
ec0163c7ff
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-03-11 09:55:25 -08:00
48b18e3fee
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2010-03-11 09:55:25 -08:00
fbc1435214
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-03-11 09:55:24 -08:00
d8fb08731e
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-03-11 09:55:23 -08:00
cd77260339
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-03-11 09:55:22 -08:00
b8e381d33a
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-03-11 09:55:22 -08:00
553463b261
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-03-11 09:55:21 -08:00
684a27611a
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-03-11 09:55:20 -08:00
3c0b90238d
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-03-11 09:55:19 -08:00
c4500bebba
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2010-03-11 09:55:19 -08:00
747060a2ea
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-03-11 09:55:18 -08:00
08effc0bec
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-03-11 09:55:17 -08:00
a48b62fa95
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-03-11 09:55:16 -08:00
4148574b2d
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-03-11 09:55:16 -08:00
7720159999
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-03-11 09:55:15 -08:00
4deaf5248c
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-03-11 09:55:14 -08:00
c2317af86c
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-03-11 09:55:13 -08:00
3f5b4e49ba
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-03-11 09:55:13 -08:00
4072724702
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-03-11 09:55:12 -08:00
99e94880ad
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-03-11 09:55:11 -08:00
95e5d1c43d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-03-11 09:55:08 -08:00
b6192dfa2c
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-03-11 09:55:07 -08:00
e1b58e733e
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-03-11 09:55:07 -08:00
d6b678d2c2
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2010-03-11 09:55:05 -08:00
Brian Behlendorf