3fdd36c41b
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-08-18 10:51:08 -07:00
4b9942dde6
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-08-18 10:51:07 -07:00
3f79de199a
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-08-18 10:51:04 -07:00
69172f0080
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-18 10:51:03 -07:00
2cdd4df6f5
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-08-18 10:51:01 -07:00
a123596f59
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-08-18 10:51:00 -07:00
6cf1665857
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-08-18 10:50:57 -07:00
bfba5a38a4
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-08-18 10:50:57 -07:00
35bc633c8e
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-08-18 10:50:54 -07:00
eef4fb6f84
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-08-18 10:50:53 -07:00
d147b7b868
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-08-18 10:50:50 -07:00
b4ce3c7600
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-08-18 10:50:50 -07:00
8d6b93e26a
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-08-18 10:50:47 -07:00
09f0e58dbb
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-08-18 10:50:46 -07:00
52ca3b8821
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-08-18 10:50:46 -07:00
9a02f2955e
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-08-18 10:50:41 -07:00
9577858f6b
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-08-18 10:50:40 -07:00
3c4bef14fc
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-08-18 10:50:40 -07:00
67b871b333
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-08-18 10:50:35 -07:00
777c453fba
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-08-18 10:50:34 -07:00
d5a1de0699
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-08-18 10:50:31 -07:00
a908d6459e
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-08-18 10:50:30 -07:00
47ac8c7dba
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-08-18 10:50:28 -07:00
59a6b6ca27
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-08-18 10:50:27 -07:00
a08f68217d
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-08-18 10:50:24 -07:00
650eeea33e
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-08-18 10:50:23 -07:00
f8502d7e00
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-08-18 10:50:21 -07:00
7096d1493d
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-08-18 10:50:20 -07:00
48dae5b818
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-18 10:50:17 -07:00
44461776c4
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-08-18 10:50:16 -07:00
adc7bb76f2
Add 3 dragon drawer test configurations (raid0, raidz, raidz2).
...
The current test rig consists of two 60 disk dragon drawers in configured
in 4-x15 mode. Each drawer has 4 SAS connections to my node for a total
of 8 SAS connections spread over 4 dual-port LSI SAS adapters. The
configures are as follows:
- raid0: All 120 drives in a single pool.
- raidz: 15 RAIDZ groups of 7+1.
- raidz2: 15 RAIDZ2 groups of 6+2.
2009-08-18 10:40:30 -07:00
6afc10589c
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-08-18 09:40:11 -07:00
05e1ea4428
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-08-18 09:40:08 -07:00
e939486047
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-08-18 09:40:05 -07:00
a6d52924a0
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-08-18 09:40:01 -07:00
d2663f7119
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:58 -07:00
8d58e9ee45
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:55 -07:00
ef5e6b8915
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:51 -07:00
b963b34b66
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:48 -07:00
e10c76c84c
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:45 -07:00
cb0a4d25dd
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:42 -07:00
0fae071614
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:38 -07:00
c4f1e1eb9f
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:35 -07:00
f5be401f9c
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:32 -07:00
39ed68a009
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:26 -07:00
616df0cf61
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:20 -07:00
940cffa845
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:17 -07:00
f6e773e7fc
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:13 -07:00
ccad175693
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:10 -07:00
4c172258f0
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-08-18 09:39:06 -07:00
Brian Behlendorf