Brian Behlendorf
|
e5b11da907
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:32:24 -08:00 |
|
Brian Behlendorf
|
23e70625e7
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-09 11:32:22 -08:00 |
|
Brian Behlendorf
|
db6a52e1f1
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:32:19 -08:00 |
|
Brian Behlendorf
|
eb1d92a0eb
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-09 11:32:17 -08:00 |
|
Brian Behlendorf
|
6b044ad11d
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:32:12 -08:00 |
|
Brian Behlendorf
|
9ef4ad022a
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-09 11:32:09 -08:00 |
|
Brian Behlendorf
|
745a0f0f13
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:32:06 -08:00 |
|
Brian Behlendorf
|
730aeef46c
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-09 11:32:03 -08:00 |
|
Brian Behlendorf
|
3090424665
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:32:00 -08:00 |
|
Brian Behlendorf
|
8c291f0964
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 11:31:58 -08:00 |
|
Brian Behlendorf
|
df74a843af
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:31:55 -08:00 |
|
Brian Behlendorf
|
e39cb8adab
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 11:31:53 -08:00 |
|
Brian Behlendorf
|
edb68733f2
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:31:50 -08:00 |
|
Brian Behlendorf
|
a4df8635db
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 11:31:48 -08:00 |
|
Brian Behlendorf
|
ab0e08c058
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 11:31:47 -08:00 |
|
Brian Behlendorf
|
6b4205fe71
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:31:42 -08:00 |
|
Brian Behlendorf
|
f612969bdf
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 11:31:40 -08:00 |
|
Brian Behlendorf
|
f2cd442807
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 11:31:39 -08:00 |
|
Brian Behlendorf
|
3e51a61b0e
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:31:33 -08:00 |
|
Brian Behlendorf
|
e7cde4f700
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-09 11:31:31 -08:00 |
|
Brian Behlendorf
|
ede7f57f6b
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:31:28 -08:00 |
|
Brian Behlendorf
|
1178afffea
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-09 11:31:26 -08:00 |
|
Brian Behlendorf
|
6aba3a09f7
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:31:23 -08:00 |
|
Brian Behlendorf
|
d7d4ace9ff
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-09 11:31:21 -08:00 |
|
Brian Behlendorf
|
30019502b4
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:31:18 -08:00 |
|
Brian Behlendorf
|
6bf5694a1a
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-09 11:31:16 -08:00 |
|
Brian Behlendorf
|
745bf61986
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:31:12 -08:00 |
|
Brian Behlendorf
|
33eac2c179
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-09 11:31:10 -08:00 |
|
Brian Behlendorf
|
f6a4828fad
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:31:07 -08:00 |
|
Brian Behlendorf
|
5ff6b7c7e0
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-09 11:31:05 -08:00 |
|
Brian Behlendorf
|
2100e8b432
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:31:02 -08:00 |
|
Brian Behlendorf
|
0396dfb92f
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 11:31:00 -08:00 |
|
Brian Behlendorf
|
d7f4512ed3
|
Quiet warnings for now
|
2009-01-09 11:29:00 -08:00 |
|
Brian Behlendorf
|
dd50143ea1
|
Add module load/unload entry point hooks and ioctl integration
|
2009-01-09 11:21:59 -08:00 |
|
Brian Behlendorf
|
ae2253ac80
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-09 11:18:02 -08:00 |
|
Brian Behlendorf
|
4a14b7cfbd
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-01-09 11:18:00 -08:00 |
|
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
|
dfa2f53567
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-09 09:23:36 -08:00 |
|
Brian Behlendorf
|
9faaff16e5
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-01-09 09:23:33 -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 |