Brian Behlendorf
d2b54ef5e4
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-10-06 12:28:25 -07:00
Brian Behlendorf
be7d71c979
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-10-06 12:28:20 -07:00
Brian Behlendorf
12ccd052b9
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-10-06 12:28:06 -07:00
Brian Behlendorf
63a525fc35
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-10-06 12:28:04 -07:00
Brian Behlendorf
c124e42f37
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-10-06 12:27:53 -07:00
Brian Behlendorf
5b421bb734
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-10-06 12:27:51 -07:00
Brian Behlendorf
6df0b54851
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-10-06 12:27:50 -07:00
Brian Behlendorf
bea5b8a0a2
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-10-06 12:27:31 -07:00
Brian Behlendorf
cf1bc6baa5
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-10-06 12:27:28 -07:00
Brian Behlendorf
459a322df3
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-10-06 12:27:27 -07:00
Brian Behlendorf
b62da845fa
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-10-06 12:27:08 -07:00
Brian Behlendorf
9aad2e472d
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-10-06 12:27:06 -07:00
Brian Behlendorf
65247f02f1
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-10-06 12:26:55 -07:00
Brian Behlendorf
1782fd666b
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-10-06 12:26:53 -07:00
Brian Behlendorf
a16e41a017
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-10-06 12:26:43 -07:00
Brian Behlendorf
dcd9fe036c
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-10-06 12:26:40 -07:00
Brian Behlendorf
6549dab429
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-10-06 12:26:30 -07:00
Brian Behlendorf
cb3aae128d
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-10-06 12:26:23 -07:00
Brian Behlendorf
b8a8f82afd
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-10-06 12:26:13 -07:00
Brian Behlendorf
06c1497e59
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-10-06 12:26:10 -07:00
Brian Behlendorf
e22d671281
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-10-06 12:26:00 -07:00
Brian Behlendorf
309ace9fe3
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-10-06 12:25:57 -07:00
Brian Behlendorf
5bc2e9e592
Add spa_config_path module option for alternate cache file.
2009-10-06 12:17:38 -07:00
Brian Behlendorf
5d4c60fabe
Use alternate /etc/zfs/zpool.cache file for in-tree tests
...
Pass an alternate location via module option for the zpool.cache file
used by the kernel. This allows us to write in-tree tests which do
not modify any out-of-tree files we do not own. This is just standard
good behavior for any test suite.
Additionally, refine the existing test case to explicity use the cache
file when looking for pools to import. And add a second test cache
which is forced to probe the disks for available pools to import.
2009-10-06 12:12:05 -07:00
Brian Behlendorf
5724183022
Merge commit 'refs/top-bases/top' into top
2009-10-05 13:12:19 -07:00
Brian Behlendorf
dccffd6aaa
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-05 13:12:17 -07:00
Brian Behlendorf
505d26fb5b
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-10-05 13:12:15 -07:00
Brian Behlendorf
f9d69a0aca
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-10-05 13:12:14 -07:00
Brian Behlendorf
a90f5d634f
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-10-05 13:12:12 -07:00
Brian Behlendorf
7d8bf0df2b
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-10-05 13:12:05 -07:00
Brian Behlendorf
e976243c9c
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-10-05 13:12:03 -07:00
Brian Behlendorf
a930a145ef
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-10-05 13:11:56 -07:00
Brian Behlendorf
e1206c7a76
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-10-05 13:11:54 -07:00
Brian Behlendorf
0fcdcd93fd
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-10-05 13:11:46 -07:00
Brian Behlendorf
0346419a1b
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-10-05 13:11:45 -07:00
Brian Behlendorf
c98707e5ba
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-10-05 13:11:37 -07:00
Brian Behlendorf
0b917078fe
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-10-05 13:11:36 -07:00
Brian Behlendorf
0647afd2a2
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-10-05 13:11:28 -07:00
Brian Behlendorf
ba270e398a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-10-05 13:11:26 -07:00
Brian Behlendorf
cc26aa94fc
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-10-05 13:11:19 -07:00
Brian Behlendorf
bde0cf28b9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-10-05 13:11:10 -07:00
Brian Behlendorf
600eac55ba
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-10-05 13:11:02 -07:00
Brian Behlendorf
93f8b6d142
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-10-05 13:11:01 -07:00
Brian Behlendorf
d8d61fa9ab
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-10-05 13:10:54 -07:00
Brian Behlendorf
b9e1e0c63d
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-10-05 13:10:52 -07:00
Brian Behlendorf
b8804fd4ec
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-10-05 13:10:44 -07:00
Brian Behlendorf
ea42808641
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-05 13:10:43 -07:00
Brian Behlendorf
fc3a018fda
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-10-05 13:10:34 -07:00
Brian Behlendorf
d4dad0e52b
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-10-05 13:10:33 -07:00
Brian Behlendorf
010c4a17a9
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-10-05 13:10:23 -07:00
