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
3bdc98c844
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
configure.ac
scripts/Makefile.am
2009-08-18 09:38:17 -07:00
18f53f542b
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-08-17 21:57:02 -07:00
44020d0ec3
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-08-17 21:57:01 -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
f35bca5100
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-08-17 21:47:52 -07:00
4affe8b59f
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-08-17 21:47:51 -07:00
8c31c11591
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-08-17 21:47:49 -07:00
36604a118b
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-08-17 21:47:42 -07:00
83003b2fa9
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-08-17 21:47:40 -07:00
6ee3a5b3a2
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-08-17 21:47:32 -07:00
29bd5696bf
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-08-17 21:47:30 -07:00
1528509223
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-08-17 21:47:23 -07:00
757483ca58
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-08-17 21:47:21 -07:00
3830822ccf
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-08-17 21:47:13 -07:00
126619b28b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-08-17 21:47:12 -07:00
261ceaea10
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-08-17 21:47:03 -07:00
48107741cd
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
configure.ac
scripts/Makefile.am
2009-08-17 21:46:51 -07:00
c0e168637d
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-08-17 21:45:56 -07:00
fa3211f17b
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-08-17 21:45:54 -07:00
1d19a0a8a9
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-08-17 21:45:46 -07:00
6d02deb2af
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-17 21:45:45 -07:00
4d6f7b9e02
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-08-17 21:45:37 -07:00
24405e1d65
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-08-17 21:45:35 -07:00
16ecccc8a8
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-08-17 21:45:26 -07:00
71fc3afa47
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-08-17 21:45:25 -07:00
422682d7aa
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-08-17 21:45:17 -07:00
129c873ecd
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-08-17 21:45:15 -07:00
61e8994069
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-08-17 21:45:07 -07:00
c18866f1dc
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-08-17 21:45:05 -07:00
8f512b282f
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-08-17 21:44:58 -07:00
4f10caa09f
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-08-17 21:44:56 -07:00
6b6275de0f
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-08-17 21:44:55 -07:00
4e642d9c1e
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-08-17 21:44:41 -07:00
57639d4629
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-08-17 21:44:39 -07:00
f4622dcf3e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-08-17 21:44:38 -07:00
a03a6b2469
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-08-17 21:44:24 -07:00
cb0dfc1d05
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-08-17 21:44:22 -07:00
3f324edb78
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-08-17 21:44:15 -07:00
af5134e564
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-08-17 21:44:12 -07:00
fc05295698
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-08-17 21:44:04 -07:00
4f3003ea5c
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-08-17 21:44:03 -07:00
7bb894c442
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-08-17 21:43:55 -07:00
ddba690873
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-08-17 21:43:53 -07:00
3b8b3a2784
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-08-17 21:43:45 -07:00
Brian Behlendorf