Brian Behlendorf
|
2f1ba85948
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:17:59 -08:00 |
|
Brian Behlendorf
|
be9f92ecd6
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:17:57 -08:00 |
|
Brian Behlendorf
|
7902b5fdf1
|
Add HAVE_ZVOL wrappers
|
2009-01-09 11:16:01 -08:00 |
|
Brian Behlendorf
|
86a5af4d25
|
Update HAVE_ZPL bits for zfs_ioctl
|
2009-01-09 11:13:22 -08:00 |
|
Brian Behlendorf
|
3ab2cf1b96
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:23:32 -08:00 |
|
Brian Behlendorf
|
469bd888eb
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 09:23:30 -08:00 |
|
Brian Behlendorf
|
ef263760df
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:23:27 -08:00 |
|
Brian Behlendorf
|
1cbb1d14bc
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-09 09:23:25 -08:00 |
|
Brian Behlendorf
|
93c5393bd3
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:23:22 -08:00 |
|
Brian Behlendorf
|
d5dd1e9bf7
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-09 09:23:20 -08:00 |
|
Brian Behlendorf
|
70ae60db4e
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:23:17 -08:00 |
|
Brian Behlendorf
|
5a04b50177
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-09 09:23:15 -08:00 |
|
Brian Behlendorf
|
e4276c9034
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:23:11 -08:00 |
|
Brian Behlendorf
|
bf82547741
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-09 09:23:09 -08:00 |
|
Brian Behlendorf
|
d0bfc52310
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:23:06 -08:00 |
|
Brian Behlendorf
|
1ea84d39c0
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-09 09:23:04 -08:00 |
|
Brian Behlendorf
|
3b748ffe2b
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:23:01 -08:00 |
|
Brian Behlendorf
|
cb118de68f
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-09 09:22:59 -08:00 |
|
Brian Behlendorf
|
35bc51b425
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:22:56 -08:00 |
|
Brian Behlendorf
|
58fe3421b7
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-09 09:22:54 -08:00 |
|
Brian Behlendorf
|
dd3dc91e7e
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:22:51 -08:00 |
|
Brian Behlendorf
|
8cd72da031
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-09 09:22:49 -08:00 |
|
Brian Behlendorf
|
139edc09ef
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:22:45 -08:00 |
|
Brian Behlendorf
|
8bb10f0528
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 09:22:44 -08:00 |
|
Brian Behlendorf
|
c90b529167
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:22:40 -08:00 |
|
Brian Behlendorf
|
00aa3c2f3d
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 09:22:39 -08:00 |
|
Brian Behlendorf
|
0baf654a75
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:22:35 -08:00 |
|
Brian Behlendorf
|
62ce4aabc6
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 09:22:33 -08:00 |
|
Brian Behlendorf
|
47f49e3634
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 09:22:33 -08:00 |
|
Brian Behlendorf
|
8e6e01febb
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:22:27 -08:00 |
|
Brian Behlendorf
|
1a106f9b4e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 09:22:25 -08:00 |
|
Brian Behlendorf
|
ed92da1e4e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 09:22:24 -08:00 |
|
Brian Behlendorf
|
5fe980337e
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:22:19 -08:00 |
|
Brian Behlendorf
|
a230183b17
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-09 09:22:17 -08:00 |
|
Brian Behlendorf
|
5e108eed1f
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:22:13 -08:00 |
|
Brian Behlendorf
|
a8fde88d7b
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-09 09:22:11 -08:00 |
|
Brian Behlendorf
|
51b83cd96f
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:22:08 -08:00 |
|
Brian Behlendorf
|
da587d49cb
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-09 09:22:06 -08:00 |
|
Brian Behlendorf
|
25a916da37
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:22:03 -08:00 |
|
Brian Behlendorf
|
814d344f5e
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-09 09:22:01 -08:00 |
|
Brian Behlendorf
|
c59b825666
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:21:58 -08:00 |
|
Brian Behlendorf
|
620c143386
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-09 09:21:56 -08:00 |
|
Brian Behlendorf
|
b4bd7364a4
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:21:52 -08:00 |
|
Brian Behlendorf
|
b577bb93c7
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-09 09:21:50 -08:00 |
|
Brian Behlendorf
|
110393189c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:21:47 -08:00 |
|
Brian Behlendorf
|
a534a8bd1f
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 09:21:36 -08:00 |
|
Brian Behlendorf
|
91b9bf3f40
|
Pulling zvol, zfs_vfsops, and zfs_ioctl to resolve those build issues
|
2009-01-09 09:19:33 -08:00 |
|
Brian Behlendorf
|
cb2148d644
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-08 16:57:23 -08:00 |
|
Brian Behlendorf
|
7b4f45a7fc
|
Update zpios.sh to use zfs.sh plus error handling
|
2009-01-08 16:53:29 -08:00 |
|
Brian Behlendorf
|
f837db6174
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-08 16:28:42 -08:00 |