93664227c7
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-06-28 10:38:43 -07:00
ba79b0e3a3
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-28 10:38:41 -07:00
c8b2451d0b
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-06-28 10:38:40 -07:00
5a3e91cb5c
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-06-28 10:38:37 -07:00
c26b7f3538
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-06-28 10:38:32 -07:00
5f0e728052
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-06-28 10:38:29 -07:00
4a19aafcef
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-06-28 10:38:24 -07:00
02ffef0481
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-06-28 10:38:22 -07:00
d1798fd399
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-06-28 10:38:16 -07:00
fc19ad74ed
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-06-28 10:38:14 -07:00
c7763d33d4
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-28 10:38:08 -07:00
18b75409bd
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-28 10:38:06 -07:00
a2bf0e7a8b
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-06-28 10:38:00 -07:00
ca22294794
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-28 10:37:58 -07:00
25e82fa1af
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-28 10:37:52 -07:00
670e4c64ca
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-28 10:37:50 -07:00
7e9c7c8d71
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-06-28 10:37:45 -07:00
6282a7704f
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-06-28 10:37:43 -07:00
00f9aa53e0
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-06-28 10:37:37 -07:00
d71f53ece7
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-06-28 10:37:34 -07:00
888b72c614
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-06-28 10:37:29 -07:00
5a80c173cd
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-06-28 10:37:27 -07:00
d3c37d45e6
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-06-28 10:37:21 -07:00
2a2492e105
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-06-28 10:37:19 -07:00
c227476f72
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-28 10:37:13 -07:00
9e841db04c
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-28 10:37:11 -07:00
ce981e8b1f
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-28 10:37:05 -07:00
37e52074e8
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-06-28 10:37:03 -07:00
bc70b08afa
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-06-28 10:36:57 -07:00
235abcb965
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-06-28 10:36:55 -07:00
0fc35eb24e
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-28 10:36:49 -07:00
6107ded5d5
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-28 10:36:47 -07:00
07eb43b53a
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-28 10:36:41 -07:00
a6411d4033
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-28 10:36:38 -07:00
c11253760f
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-06-28 10:36:33 -07:00
03eab0c703
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-28 10:36:30 -07:00
712dbf737f
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-28 10:36:24 -07:00
cecd65c15b
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-06-28 10:36:21 -07:00
744af7fa00
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-28 10:36:20 -07:00
191d5e833a
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-28 10:36:19 -07:00
e8eea67f41
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-06-28 10:36:18 -07:00
8ec85f8aee
Merge branch 'fix-stack-dmu_objset_snapshot' into refs/top-bases/fix-branch
2010-06-28 10:36:17 -07:00
ee53c67258
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2010-06-28 10:36:17 -07:00
1a967e146f
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-06-28 10:36:16 -07:00
df8d7829a8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-28 10:36:13 -07:00
af239500df
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-06-28 10:36:12 -07:00
ef3ec1c9ed
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-06-28 10:36:11 -07:00
52bb0d8e75
Ensure zio_bad_cksum_t is initialized
...
This may not strictly be needed but it does keep gcc happy. We
should keep our eye on this though if the extra bcopy significantly
impacts performance. It may.
2010-06-28 10:30:38 -07:00
94f23a6856
Ensure NULL is not returned incorrectly after the first call.
...
I'm surprised this was not caught long ago, but previous the
code actually never did call the function twice so it was
missed. Anyway, this fixes it.
2010-06-28 10:27:18 -07:00
5b1f2041e5
Silence 3 additional large kmem warnings
...
The following are 3 cases where move than 2 pages are allocated
with a kmem_alloc()... but not a lot more. For now we just disable
the warning with KM_NODEBUG and this can be revisted latter to
see if it's worth shrinking the allocation or perhaps moving it
to a slab.
2010-06-28 10:23:42 -07:00
Brian Behlendorf