Brian Behlendorf
|
1b483f09e6
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-11-16 10:37:33 -08:00 |
|
Brian Behlendorf
|
915205a6e8
|
Add autoconf checks for zvol integration.
|
2009-11-16 10:31:10 -08:00 |
|
Brian Behlendorf
|
b7b6c7d4df
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-11-15 16:28:25 -08:00 |
|
Brian Behlendorf
|
d00a0ea8a0
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-11-15 16:27:02 -08:00 |
|
Brian Behlendorf
|
844280cb2c
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2009-11-15 16:27:02 -08:00 |
|
Brian Behlendorf
|
368cfaefdb
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-11-15 16:27:00 -08:00 |
|
Brian Behlendorf
|
f056747e61
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2009-11-15 16:27:00 -08:00 |
|
Brian Behlendorf
|
71ccaccb2b
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
|
2009-11-15 16:27:00 -08:00 |
|
Brian Behlendorf
|
475e214ce1
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2009-11-15 16:27:00 -08:00 |
|
Brian Behlendorf
|
8c5797df77
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2009-11-15 16:26:58 -08:00 |
|
Brian Behlendorf
|
65f6d4b712
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2009-11-15 16:26:58 -08:00 |
|
Brian Behlendorf
|
c53763d2e7
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-11-15 16:26:55 -08:00 |
|
Brian Behlendorf
|
7188068143
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-11-15 16:26:54 -08:00 |
|
Brian Behlendorf
|
ca3aba32bb
|
Merge branch 'fix-acl' into refs/top-bases/fix-branch
|
2009-11-15 16:26:54 -08:00 |
|
Brian Behlendorf
|
d9ff087661
|
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
|
2009-11-15 16:26:53 -08:00 |
|
Brian Behlendorf
|
2985a9c531
|
Merge commit 'refs/top-bases/fix-acl' into fix-acl
|
2009-11-15 16:26:53 -08:00 |
|
Brian Behlendorf
|
f8e0e1c54d
|
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
|
2009-11-15 16:26:52 -08:00 |
|
Brian Behlendorf
|
1e60ba892b
|
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
|
2009-11-15 16:26:51 -08:00 |
|
Brian Behlendorf
|
8489fdd251
|
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
|
2009-11-15 16:26:51 -08:00 |
|
Brian Behlendorf
|
7d49468141
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-11-15 16:26:50 -08:00 |
|
Brian Behlendorf
|
a81f45b3ee
|
Merge commit 'refs/top-bases/fix-list' into fix-list
|
2009-11-15 16:26:50 -08:00 |
|
Brian Behlendorf
|
a41e8c431f
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2009-11-15 16:26:49 -08:00 |
|
Brian Behlendorf
|
e530326e8f
|
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
|
2009-11-15 16:26:48 -08:00 |
|
Brian Behlendorf
|
2c76b1eae5
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2009-11-15 16:26:47 -08:00 |
|
Brian Behlendorf
|
b57e406dd6
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2009-11-15 16:26:47 -08:00 |
|
Brian Behlendorf
|
e1658bc3c0
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2009-11-15 16:26:46 -08:00 |
|
Brian Behlendorf
|
45b0c5f49c
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2009-11-15 16:26:45 -08:00 |
|
Brian Behlendorf
|
756ced6a4e
|
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
|
2009-11-15 16:26:44 -08:00 |
|
Brian Behlendorf
|
12ed77ee86
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2009-11-15 16:26:44 -08:00 |
|
Brian Behlendorf
|
08b581e77b
|
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
|
2009-11-15 16:26:43 -08:00 |
|
Brian Behlendorf
|
df9f0836db
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2009-11-15 16:26:43 -08:00 |
|
Brian Behlendorf
|
437a6a6f61
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2009-11-15 16:26:42 -08:00 |
|
Brian Behlendorf
|
e663d428a4
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2009-11-15 16:26:42 -08:00 |
|
Brian Behlendorf
|
3206618a84
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2009-11-15 16:26:41 -08:00 |
|
Brian Behlendorf
|
dc5f610e90
|
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
|
2009-11-15 16:26:40 -08:00 |
|
Brian Behlendorf
|
584ad2b364
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2009-11-15 16:26:40 -08:00 |
|
Brian Behlendorf
|
8d0c0b0782
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2009-11-15 16:26:39 -08:00 |
|
Brian Behlendorf
|
0b57c83685
|
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
|
2009-11-15 16:26:38 -08:00 |
|
Brian Behlendorf
|
b3c507f429
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2009-11-15 16:26:38 -08:00 |
|
Brian Behlendorf
|
d5933419e0
|
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
|
2009-11-15 16:26:37 -08:00 |
|
Brian Behlendorf
|
dcd4d95764
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2009-11-15 16:26:37 -08:00 |
|
Brian Behlendorf
|
e57bf40c98
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2009-11-15 16:26:36 -08:00 |
|
Brian Behlendorf
|
00f3dfb5e9
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2009-11-15 16:26:36 -08:00 |
|
Brian Behlendorf
|
59cbe87375
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-11-15 16:26:31 -08:00 |
|
Brian Behlendorf
|
51bc0df445
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-11-15 16:26:30 -08:00 |
|
Brian Behlendorf
|
2bee739b4c
|
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
|
2009-11-15 16:26:30 -08:00 |
|
Brian Behlendorf
|
13309c929d
|
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
|
2009-11-15 16:26:29 -08:00 |
|
Brian Behlendorf
|
4ef70c783d
|
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
|
2009-11-15 16:26:27 -08:00 |
|
Brian Behlendorf
|
ed1f75364a
|
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
|
2009-11-15 16:26:26 -08:00 |
|
Brian Behlendorf
|
d80d6e9bc0
|
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
|
2009-11-15 16:26:24 -08:00 |