Brian Behlendorf
1d8ef486a8
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-07-07 13:50:30 -07:00
Brian Behlendorf
fb26df15c8
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-07-07 13:50:30 -07:00
Brian Behlendorf
cad9fa40e1
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-07-07 13:50:29 -07:00
Brian Behlendorf
a2423197e1
Resolve missing cast warning
2009-07-07 13:41:51 -07:00
Brian Behlendorf
361e0e7685
Fix newly introduced missing braces warnings for gcc.
2009-07-07 13:40:16 -07:00
Brian Behlendorf
ee92267c38
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-07-07 13:20:40 -07:00
Brian Behlendorf
9661d38088
Add topic branch to conditionally remove idmap support. The
...
only things currently like this on linux appears in the nfs v4
implementation of idmap. For now we can do with out.
2009-07-07 13:16:24 -07:00
Brian Behlendorf
70804727b1
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-07 10:15:04 -07:00
Brian Behlendorf
5ae3e75ace
Wrap new sysevent includes in HAVE_SYSEVENT ifdef
2009-07-07 10:07:23 -07:00
Brian Behlendorf
20989cd4f2
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-06 17:01:43 -07:00
Brian Behlendorf
e49bdb470e
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-06 17:01:42 -07:00
Brian Behlendorf
169b3085db
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
...
Conflicts:
module/zfs/dmu.c
2009-07-06 17:01:30 -07:00
Brian Behlendorf
621679fec6
Update to use dmu_read() instead of dmu_read_impl() now that a 'flags'
...
argument is available. This flags argument was added to allow a clean
API for disabling prefetch, so I'll update zpios to use it in preference
to the module option hack used before.
2009-07-06 16:51:59 -07:00
Brian Behlendorf
1175906fbc
Update zerocopy patch to be consistent with new flags arg
...
passed to dmu_read(). It would be nice to have one of these
for dmu_write() as well but we have do without for now.
2009-07-06 16:01:41 -07:00
Brian Behlendorf
9c51d2af2d
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-07-06 15:42:37 -07:00
Brian Behlendorf
06a30ede64
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-06 15:42:35 -07:00
Brian Behlendorf
3651aad7ca
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-07-06 15:42:27 -07:00
Brian Behlendorf
53247399a0
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-06 15:42:24 -07:00
Brian Behlendorf
231252bfb0
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-07-06 15:42:15 -07:00
Brian Behlendorf
3769daad38
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-06 15:42:12 -07:00
Brian Behlendorf
989d542290
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-06 15:42:03 -07:00
Brian Behlendorf
7923799643
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-06 15:42:01 -07:00
Brian Behlendorf
8e95e45f6f
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-06 15:41:52 -07:00
Brian Behlendorf
684a4c5f30
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-06 15:41:50 -07:00
Brian Behlendorf
4021e9fe48
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-07-06 15:41:39 -07:00
Brian Behlendorf
f90e398526
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-06 15:41:37 -07:00
Brian Behlendorf
eb71cfcbde
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-07-06 15:41:29 -07:00
Brian Behlendorf
b1f39e8e19
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-06 15:41:26 -07:00
Brian Behlendorf
2734eb0d91
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-07-06 15:41:17 -07:00
Brian Behlendorf
3c15f2d6ff
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-06 15:41:15 -07:00
Brian Behlendorf
8f5b016f3c
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-07-06 15:41:07 -07:00
Brian Behlendorf
cfc5a1d037
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-06 15:41:04 -07:00
Brian Behlendorf
8f9633a3db
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-06 15:40:55 -07:00
Brian Behlendorf
769c63c4a3
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-06 15:40:53 -07:00
Brian Behlendorf
79fa5dabaa
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-07-06 15:40:45 -07:00
Brian Behlendorf
c687f41e5f
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-06 15:40:42 -07:00
Brian Behlendorf
c806a4b360
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-06 15:40:34 -07:00
Brian Behlendorf
95eece56ab
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-06 15:40:32 -07:00
Brian Behlendorf
9120dc8579
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-06 15:40:31 -07:00
Brian Behlendorf
68305a84e6
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-06 15:40:16 -07:00
Brian Behlendorf
f295209389
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-06 15:40:14 -07:00
Brian Behlendorf
ba95b1816a
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-06 15:40:13 -07:00
Brian Behlendorf
b89b54cdc7
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-07-06 15:39:58 -07:00
Brian Behlendorf
87739b2e3a
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-07-06 15:39:56 -07:00
Brian Behlendorf
f9e5daa9f2
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-07-06 15:39:48 -07:00
Brian Behlendorf
8457194abf
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-06 15:39:46 -07:00
Brian Behlendorf
625116c97a
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-07-06 15:39:38 -07:00
Brian Behlendorf
d895de5ecb
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-06 15:39:35 -07:00
Brian Behlendorf
b21eea99a1
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-07-06 15:39:27 -07:00
Brian Behlendorf
093f510c09
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-07-06 15:39:24 -07:00