Brian Behlendorf
6ef15db027
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-10-09 15:03:50 -07:00
Brian Behlendorf
f73cff230f
Reverting changes on linux-have-libefi topic branch.
2009-10-09 14:59:05 -07:00
Brian Behlendorf
eb89539945
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-10-06 12:31:04 -07:00
Brian Behlendorf
793a57d2c9
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-10-06 12:30:59 -07:00
Brian Behlendorf
79a47333cd
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-10-06 12:30:47 -07:00
Brian Behlendorf
3b8e4c19c7
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-10-06 12:30:44 -07:00
Brian Behlendorf
bb912430cb
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-10-06 12:30:32 -07:00
Brian Behlendorf
904db6e6a2
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-10-06 12:30:30 -07:00
Brian Behlendorf
3a91447e35
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-10-06 12:30:18 -07:00
Brian Behlendorf
50489de85f
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-10-06 12:30:15 -07:00
Brian Behlendorf
0899e5af49
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-10-06 12:30:03 -07:00
Brian Behlendorf
f7a36151b9
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-10-06 12:30:01 -07:00
Brian Behlendorf
6652066012
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-10-06 12:29:47 -07:00
Brian Behlendorf
a4a2726d2a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-10-06 12:29:44 -07:00
Brian Behlendorf
9ebd738eca
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-10-06 12:29:29 -07:00
Brian Behlendorf
b7eee3471a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-10-06 12:29:26 -07:00
Brian Behlendorf
8fe69c99c0
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-10-06 12:29:14 -07:00
Brian Behlendorf
9afb3b4147
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-10-06 12:29:11 -07:00
Brian Behlendorf
39ccd235b0
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-10-06 12:29:00 -07:00
Brian Behlendorf
536e57dbb8
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-10-06 12:28:54 -07:00
Brian Behlendorf
17a17f9537
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-10-06 12:28:42 -07:00
Brian Behlendorf
129713ac34
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-06 12:28:40 -07:00
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
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