77c8dbf960
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-29 17:51:12 -07:00
642da38081
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-29 17:51:09 -07:00
563526307c
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-29 17:51:07 -07:00
5fb5183c73
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-29 17:50:52 -07:00
00103d7ce4
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-29 17:50:50 -07:00
e50caae469
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-29 17:50:49 -07:00
721d8ccc36
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-07-29 17:50:31 -07:00
ad554ba8d9
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-07-29 17:50:29 -07:00
279b0fdced
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-07-29 17:50:21 -07:00
368e965fef
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-29 17:50:19 -07:00
3a701e0feb
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-07-29 17:50:10 -07:00
bb9e89091c
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-29 17:50:07 -07:00
b041856eef
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-07-29 17:49:59 -07:00
5f665fd329
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-07-29 17:49:57 -07:00
e1ea9bb67b
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-07-29 17:49:47 -07:00
2156ba969d
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-29 17:49:45 -07:00
7db01ef098
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-07-29 17:49:36 -07:00
e69b7dbaf7
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-07-29 17:49:34 -07:00
e925f6cc86
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-29 17:49:26 -07:00
aa3525d376
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-29 17:49:24 -07:00
9cabcac115
Required autoconf support for vdev_disk integration with 2.6.30 kernels.
...
2.6.22 API change
Unused destroy_dirty_buffers arg removed from prototype.
2.6.24 API change
Empty write barriers are now supported and we should use them.
2.6.24 API change
Size argument dropped from bio_endio and bi_end_io, because the
bi_end_io is only called once now when the request is complete.
There is no longer any need for a size argument. This also means
that partial IO's are no longer possibe and the end_io callback
should not check bi->bi_size. Finally, the return type was updated
to void.
2.6.28 API change
open/close_bdev_excl() renamed to open/close_bdev_exclusive().
2.6.29 API change
BIO_RW_SYNC renamed to BIO_RW_SYNCIO.
2009-07-29 17:14:23 -07:00
fdd520fd20
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-07-27 10:51:31 -07:00
f12cc4958b
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-07-27 10:51:29 -07:00
0efe5966f2
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-07-27 10:51:22 -07:00
703c8df4b5
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-27 10:51:15 -07:00
d11375ef9d
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-07-27 10:51:07 -07:00
1681e3cd4f
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-27 10:51:05 -07:00
c06a523a33
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-07-27 10:50:58 -07:00
61c9972e1c
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-27 10:50:56 -07:00
38cc77f62b
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-27 10:50:48 -07:00
9b393fb35c
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-27 10:50:47 -07:00
bff122d75a
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-27 10:50:39 -07:00
49d045e35d
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-27 10:50:31 -07:00
fa46c0acd5
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-07-27 10:50:23 -07:00
ef1f48b649
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-27 10:50:21 -07:00
7430bc80d3
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-07-27 10:50:14 -07:00
b6b75df2ee
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-27 10:50:12 -07:00
85ddd1e5a1
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-07-27 10:50:05 -07:00
960f0c118a
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-27 10:50:03 -07:00
f495f3a0da
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-07-27 10:49:50 -07:00
eb9b374d87
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-27 10:49:48 -07:00
3da344900f
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-27 10:49:40 -07:00
5f0c206b77
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-27 10:49:38 -07:00
986a76645a
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-07-27 10:49:31 -07:00
3b1dce849a
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-27 10:49:29 -07:00
97fe449387
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-27 10:49:19 -07:00
a9b7469efc
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-27 10:49:17 -07:00
0058e1070d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-27 10:49:15 -07:00
f338939725
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-27 10:49:01 -07:00
a4ceefffcf
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-27 10:48:59 -07:00
Brian Behlendorf