Brian Behlendorf
|
7da32c3c8e
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-11-20 10:30:41 -08:00 |
|
Brian Behlendorf
|
07cdadc1f8
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-11-20 10:30:27 -08:00 |
|
Brian Behlendorf
|
cac1bc41dc
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-11-20 10:29:49 -08:00 |
|
Brian Behlendorf
|
77c347db31
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-11-20 10:29:48 -08:00 |
|
Brian Behlendorf
|
9c8765a219
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-11-20 10:29:48 -08:00 |
|
Brian Behlendorf
|
0f315a58bb
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2009-11-20 10:29:47 -08:00 |
|
Brian Behlendorf
|
0160d32326
|
Symbol spa_busy() not required in Linux port removing EXPORT_SYMBOL
|
2009-11-20 10:16:37 -08:00 |
|
Brian Behlendorf
|
23304dc828
|
Add 16 drive promise JBOD zpool configs for small test setup.
|
2009-11-20 10:12:41 -08:00 |
|
Brian Behlendorf
|
6fabeffd3b
|
Additional ZVOL compatibility autoconf checks and zconfig ZVOL sanity test.
|
2009-11-20 10:04:56 -08:00 |
|
Brian Behlendorf
|
3191b962f6
|
Prevent gcc uninit compiler warning in zfs_range_unlock_reader().
|
2009-11-20 09:59:58 -08:00 |
|
Brian Behlendorf
|
e96593083f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-11-16 10:37:07 -08:00 |
|
Brian Behlendorf
|
8f7bb4a24b
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-11-16 10:36:52 -08:00 |
|
Brian Behlendorf
|
915205a6e8
|
Add autoconf checks for zvol integration.
|
2009-11-16 10:31:10 -08:00 |
|
Brian Behlendorf
|
af5810b03a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-11-15 16:27:59 -08:00 |
|
Brian Behlendorf
|
b6c57fe77e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-11-15 16:27:44 -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
|
d00a0ea8a0
|
Merge commit 'refs/top-bases/zfs-branch' into 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 |