4d01333cd4
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-18 14:37:37 -07:00
b4185ae90b
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-18 14:37:35 -07:00
d2cea03c3f
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-03-18 14:37:20 -07:00
e5a8f2a59e
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-18 14:37:18 -07:00
a9d30cd9c4
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-03-18 14:36:35 -07:00
1f0547fce8
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-18 14:36:33 -07:00
3c699a3dc8
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-18 14:36:31 -07:00
924d1c2e17
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-18 14:34:28 -07:00
551cfbc1f8
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-18 14:34:26 -07:00
5b5d766544
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-18 14:34:25 -07:00
9767afca2f
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-03-18 14:33:45 -07:00
d836d91818
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-03-18 14:33:43 -07:00
84a1cd9dff
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-03-18 14:33:28 -07:00
20b47a7b23
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-18 14:33:25 -07:00
eb5e67c99b
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-03-18 14:33:09 -07:00
3f05b34895
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-18 14:33:06 -07:00
d1fb327103
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-03-18 14:32:49 -07:00
c0a760420e
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-18 14:32:47 -07:00
7427f3d72c
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-03-18 14:32:31 -07:00
41c096d5a4
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-18 14:32:27 -07:00
01159f8903
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-03-18 14:32:11 -07:00
507bc2e8de
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-03-18 14:32:09 -07:00
c6ddce0341
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-18 14:31:53 -07:00
8a4ad9df2d
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-18 14:31:50 -07:00
70407622a7
Move `make check` ztest under ./scripts where the module stack is loaded.
2009-03-18 14:19:04 -07:00
e2212e6551
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-03-18 13:03:36 -07:00
920ba5bc5f
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-18 13:03:34 -07:00
28731591e8
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-18 13:03:32 -07:00
6ca96b06b4
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-18 13:03:00 -07:00
c96a13dbef
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-18 13:02:55 -07:00
cc4fbf2c35
Revert to previous behavior zdb fails when unable to open /dev/zfs.
...
For the moment I have added an error message to the failure path to
make it clear what happened. I have also changed the zdb ASSERT to
a VERIFY so we always catch the failure. For now we will just always
ensure the module stack is loaded, longer term we need something a
little more flexible.
2009-03-18 12:48:54 -07:00
1c925dc4ce
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-17 16:33:47 -07:00
02424a268b
Use spl_device_* macro's for portability.
2009-03-17 16:27:57 -07:00
9ce6adee54
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-17 16:07:04 -07:00
4379b0983e
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-03-17 16:07:03 -07:00
015c4a4deb
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-17 16:07:02 -07:00
1f84b8ed2c
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-17 16:07:01 -07:00
f8cd6b6b49
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-17 16:06:51 -07:00
80e98bb0f5
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-17 16:06:50 -07:00
a9b0088f48
Use include missing zfs_config.h and use ZFS_META_VERSION (not VERSION)
2009-03-17 16:02:09 -07:00
085d04563d
Add stub header which is missing in new versions of glibc
2009-03-17 15:53:34 -07:00
a0155baaa9
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-17 15:25:57 -07:00
23c544c884
Add zfs_config.h include for HAVE_2ARGS_BIO_END_IO_T define
2009-03-17 15:14:02 -07:00
6e55e47be3
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-16 16:23:20 -07:00
66860bbf39
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-16 16:23:18 -07:00
43f1d3da1e
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-16 16:23:05 -07:00
da843563aa
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-16 16:23:03 -07:00
2a5f5e651a
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-03-16 16:22:50 -07:00
357d6a92b5
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-03-16 16:22:48 -07:00
2efb0cba1c
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-16 16:22:36 -07:00
Brian Behlendorf