0f80e41c89
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/spa_misc.c
module/zfs/vdev_label.c
2009-08-18 11:55:36 -07:00
45d1cae3b8
Rebase master to b121
2009-08-18 11:43:27 -07:00
2a5509bf2e
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-08-18 11:24:26 -07:00
a8571c405a
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-08-18 11:24:17 -07:00
9f0f023501
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-08-18 11:24:07 -07:00
c5a8c8a22f
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-08-18 11:23:54 -07:00
d7b205d29e
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-08-18 11:23:46 -07:00
0be3c540b5
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-08-18 11:23:36 -07:00
b1493a422a
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-08-18 11:23:26 -07:00
cfa3e7ca30
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-08-18 11:23:14 -07:00
721e19ae88
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-08-18 11:23:05 -07:00
17f141f611
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-08-18 11:22:56 -07:00
5da177d77c
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-08-18 11:22:45 -07:00
9902370261
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-08-18 11:22:31 -07:00
a5c29136a8
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-08-18 11:22:23 -07:00
bf31be60c6
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-08-18 11:22:06 -07:00
ea65695c30
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-08-18 11:21:47 -07:00
1a4d50db14
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-08-18 11:21:38 -07:00
c33188f3e5
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-08-18 11:21:29 -07:00
585c2df5ed
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-08-18 11:21:20 -07:00
f3d59f6308
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-08-18 11:21:11 -07:00
91ab50f492
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
configure.ac
scripts/Makefile.am
2009-08-18 11:19:07 -07:00
d1021b39cc
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-08-18 10:51:28 -07:00
d00844d2b5
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-08-18 10:51:24 -07:00
137eb5e7e3
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-08-18 10:51:21 -07:00
06ba86d63a
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-08-18 10:51:17 -07:00
379a3d857d
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-08-18 10:51:14 -07:00
38f5d8fd54
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-08-18 10:51:10 -07:00
4b9942dde6
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-08-18 10:51:07 -07:00
69172f0080
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-18 10:51:03 -07:00
a123596f59
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-08-18 10:51:00 -07:00
bfba5a38a4
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-08-18 10:50:57 -07:00
eef4fb6f84
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-08-18 10:50:53 -07:00
b4ce3c7600
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-08-18 10:50:50 -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
3c4bef14fc
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-08-18 10:50:40 -07:00
9577858f6b
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-08-18 10:50:40 -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
a908d6459e
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-08-18 10:50:30 -07:00
59a6b6ca27
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-08-18 10:50:27 -07:00
650eeea33e
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-08-18 10:50:23 -07:00
7096d1493d
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-08-18 10:50:20 -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
8e954086b9
Add zpios scripts to zfs-test package test infrastructure.
...
This change extends the existing in-tree test infrastructure such
that it can also be run as part of a the installed package. This
simplifies testing on multiple systems and is generally all around
useful. The scripts may still be run in-tree and will use the
in-tree build products as long as .script-config exists.
2009-08-17 21:50:55 -07:00
8c31c11591
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-08-17 21:47:49 -07:00
83003b2fa9
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-08-17 21:47:40 -07:00
29bd5696bf
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-08-17 21:47:30 -07:00
757483ca58
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-08-17 21:47:21 -07:00
Brian Behlendorf