68a2ae2594
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-29 16:58:37 -07:00
3b0e8e41d1
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-29 16:58:10 -07:00
f5cb411fc1
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-29 16:58:01 -07:00
068b74a60e
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-29 16:57:52 -07:00
9c4837d5da
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-29 16:57:45 -07:00
5387c446cf
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-29 16:57:41 -07:00
f28ca65b92
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-29 16:57:41 -07:00
015677660a
Merge branch 'fix-stack-traverse_visitbp' into refs/top-bases/fix-branch
2010-06-29 16:57:39 -07:00
f20301b41b
Minor fix to ensure tv_depth is there when debugging is disabled.
2010-06-29 16:52:42 -07:00
4e8b0b7409
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-29 11:13:48 -07:00
3658e74315
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-29 11:13:41 -07:00
7b10b97c18
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-29 11:13:32 -07:00
a0e90a15ec
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-29 11:12:51 -07:00
91023a3daf
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-29 11:12:26 -07:00
68b79f258d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-29 11:12:17 -07:00
e52951a257
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-29 11:12:09 -07:00
a1ccea7c7f
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-29 11:12:03 -07:00
2eceb0c47a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-29 11:12:00 -07:00
b0c8dc3c75
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-29 11:11:59 -07:00
46b2d46053
Merge branch 'fix-stack-traverse_visitbp' into refs/top-bases/fix-branch
2010-06-29 11:04:51 -07:00
34229a2f2a
Reduce stack usage for recursive traverse_visitbp()
...
Due to limited stack space recursive functions are frowned upon in
the Linux kernel. However, they often are the most elegant solution
to a problem. The following code preserves the recursive function
traverse_visitbp() but moves the local variables AND function
arguments to the heap to minimize the stack frame size. Enough
space is initially allocated on the stack for 20 levels of recursion.
This change does ugly-up-the-code but it reduces the worst case
usage from roughly 4160 bytes to 960 bytes on x86_64 archs.
2010-06-29 11:04:26 -07:00
f13bc68113
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-29 11:01:46 -07:00
f281cb3d2d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-29 11:01:37 -07:00
0576c0ce91
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-29 11:01:29 -07:00
b91da0086f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-29 11:00:47 -07:00
c2e6290a45
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-29 11:00:21 -07:00
67850fa14f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-29 11:00:12 -07:00
120e89d397
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-29 11:00:04 -07:00
b8229898ab
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-29 10:59:58 -07:00
0a2b049259
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-29 10:59:54 -07:00
ffeafc898e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-06-29 10:55:38 -07:00
b873e71b0f
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-29 10:29:42 -07:00
192b36dcfd
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-06-29 10:25:31 -07:00
9cdd80e387
Revert traverse_impl() changes
...
These changes are now taken care of by the fix-stack-traverse_impl
topic branch which not only solves the uninit problem but also
moves these locals off the stack and on to the heap.
2010-06-29 10:24:14 -07:00
96bd9f434d
Merge branch 'fix-stack-traverse_impl' into refs/top-bases/fix-branch
2010-06-29 10:21:53 -07:00
8e2de85a6d
Reduce stack usage of traverse_impl()
...
Stack use reduced from 560 bytes to 128 bytes.
2010-06-29 10:21:21 -07:00
51a936233f
Merge branch 'fix-stack-dsl_dataset_destroy' into refs/top-bases/fix-branch
2010-06-29 10:12:03 -07:00
7334572416
Reduce stack usage by dsl_dataset_destroy()
...
Move dsl_dataset_t local variable from the stack to the heap.
This reduces the stack usage of this function from 2048 bytes
to 176 bytes for x84_64 arches.
2010-06-29 10:11:32 -07:00
b2313a226a
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-28 11:31:27 -07:00
759df09df2
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-28 11:31:03 -07:00
61adb3379a
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-28 11:30:55 -07:00
c02813baef
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-06-28 11:30:47 -07:00
f32ec2346b
Linux bcopy() requires word aligned memory, use memcpy()
...
Much to my surprise bcopy() under Linux appears to copy the data in
word sized chunks. It does the right thing but if you buffer is not
a multiple of the word size you will be reading past the end of your
buffer. Or at least that is what valgrind is reporting. We should
be using mempcy() anyway on Linux so replace bcopy() with memcpy()
to resolve the issue.
==305== Thread 211:
==305== Invalid read of size 8
==305== at 0x3BCD28357D: _wordcopy_fwd_dest_aligned (in /lib64/libc-2.11.1.so)
==305== by 0x3BCD282B05: bcopy (in /lib64/libc-2.11.1.so)
==305== by 0x58D7FEF: dmu_write (dmu.c:730)
==305== by 0x591C942: spa_history_write (spa_history.c:165)
==305== by 0x591D255: spa_history_log_sync (spa_history.c:277)
==305== by 0x591D545: log_internal (spa_history.c:450)
==305== by 0x591D5EC: spa_history_log_internal (spa_history.c:475)
==305== by 0x5902319: dsl_prop_set_sync (dsl_prop.c:707)
==305== by 0x5906A7D: dsl_sync_task_group_sync (dsl_synctask.c:199)
==305== by 0x58FF4EC: dsl_pool_sync (dsl_pool.c:376)
==305== by 0x591744C: spa_sync (spa.c:5365)
==305== by 0x5922C85: txg_sync_thread (txg.c:414)
2010-06-28 11:26:20 -07:00
4970b635e8
Revert to original debugging
...
The ZFS defaults are fine, revert to them.
2010-06-28 10:58:16 -07:00
643eada5f6
Disable zero-copy in zpios
...
We need to update this code to use the new API. For now simply
comment it out until it can be correctly implemented.
2010-06-28 10:53:51 -07:00
f9a7332118
Update kmem_asprintf() and kmem_vasprintf() implementation
...
On a Linux system simply use the native aprintf and vasprintf
functions respectively. Also update the call points to correctly
use va_copy() or va_start() as appropriate.
2010-06-28 10:52:22 -07:00
18b75409bd
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-28 10:38:06 -07:00
ca22294794
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-28 10:37:58 -07:00
670e4c64ca
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-28 10:37:50 -07:00
9e841db04c
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-28 10:37:11 -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
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
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
8ec85f8aee
Merge branch 'fix-stack-dmu_objset_snapshot' 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
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
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
d6ea5e8cef
Additional ZVOL cleanup in zvol_set_volsize()
...
The following cleanup was missed in the first pass when the ZVOL
implementation was updated. An extra instance of a zvol_state_t
was removed from the stack and the error handling was simplified.
2010-06-28 10:21:24 -07:00
6914386b85
Never sleep under taskq_dispatch()
...
There are cases where under Linux it is not safe to sleep in
taskq_dispatch(). Rather than adding Linux specific code to
detect these cases I opted to keep it simple and just never
allow a sleep here. The impact of this should be minimal.
2010-06-28 10:11:12 -07:00
0c11631b02
Fix for fix-stack-dmu_objset_snapshot should be 'sn' not '&sn'
...
I missed a instanse of removing the & operator when reducing the
stack usage in this function. This unfortunately doesn't cause
a compile warning but it is does cause ztest failures. Anyway,
update the topic branch to correct this mistake.
2010-06-28 10:06:29 -07:00
e780aad257
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-06-21 22:01:57 -07:00
06376e3a0e
Revert linux-debug-zerocopy real ZC support added
2010-06-21 21:39:06 -07:00
53e9660c56
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-16 14:45:03 -07:00
5cac48ae66
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-16 14:45:02 -07:00
5a46abc9a0
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-16 14:44:50 -07:00
18ead3a526
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-16 14:44:43 -07:00
67c6255292
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-16 14:44:05 -07:00
76ad38b271
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-16 14:43:43 -07:00
4aba89bb16
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-16 14:43:35 -07:00
4af4558675
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-16 14:43:26 -07:00
8645a8e901
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-16 14:43:21 -07:00
2f457b7bd0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-16 14:43:17 -07:00
8de2671680
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-16 14:43:17 -07:00
6504afae4a
Merge branch 'fix-stack-dmu_objset_snapshot' into refs/top-bases/fix-branch
2010-06-16 14:39:41 -07:00
e163b08ba3
Add fix-stack-dmu_objset_snapshot topic branch
...
Reduce stack usage by 276 bytes by moving the snaparg struct from the
stack to the heap. We have limited stack space we must not waste.
2010-06-16 14:39:06 -07:00
a2ba5b83f8
Merge branch 'fix-stack-noinline' into refs/top-bases/fix-branch
2010-06-16 14:35:14 -07:00
bbdb8184ec
Add fix-stack-noinline topic branch
...
Certain function must never be automatically inlined by gcc because
they are stack heavy or called recursively. This patch flags all
such functions I have found as 'noinline' to prevent gcc from making
the optimization.
2010-06-16 14:34:41 -07:00
f956c97dc3
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-16 14:29:17 -07:00
f83c9f790e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-16 14:29:16 -07:00
9513d614a5
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-16 14:29:05 -07:00
29df979686
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-16 14:28:57 -07:00
d30e62105f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-16 14:28:19 -07:00
17edc470ca
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-16 14:27:56 -07:00
850510ee8f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-16 14:27:48 -07:00
b76cabbeaf
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-16 14:27:40 -07:00
76f112175f
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-16 14:27:35 -07:00
48ca6d3590
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-16 14:27:31 -07:00
7f979b27f4
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-16 14:27:30 -07:00
30c03a0914
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-06-16 14:27:29 -07:00
2115c30515
Revert fix-stack topic branch
...
This patch will be broken in to several independent stack reductions
and reapplied as new topic branches.
2010-06-16 14:23:31 -07:00
e536586568
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-16 13:54:49 -07:00
37dfa2ca00
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-16 13:54:48 -07:00
16dd4c6bb3
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-16 13:54:37 -07:00
56b4546e2c
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-16 13:54:30 -07:00
38f71c17a7
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-16 13:53:55 -07:00
9cebf85651
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-16 13:53:32 -07:00
2084051282
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-16 13:53:24 -07:00
2f10c62c32
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-16 13:53:16 -07:00
9ba17b0b96
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-16 13:53:11 -07:00
aacc00b961
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-16 13:53:08 -07:00
6a19e49908
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-16 13:53:07 -07:00
256505afb0
Merge branch 'fix-stack-dsl_deleg_get' into refs/top-bases/fix-branch
2010-06-16 13:49:55 -07:00
869764f64d
Add fix-stack-dsl_deleg_get topic branch
...
Reduce stack usage in dsl_deleg_get, gcc flagged it as consuming a
whopping 1040 bytes or potentially 1/4 of a 4K stack. This patch
moves all the large structures and buffer off the stack and on to
the heap. This includes 2 zap_cursor_t structs each 52 bytes in
size, 2 zap_attribute_t structs each 280 bytes in size, and 1
256 byte char array. The total saves on the stack is 880 bytes
after you account for the 5 new pointers added.
Also the source buffer length has been increased from MAXNAMELEN
to MAXNAMELEN+strlen(MOS_DIR_NAME)+1 as described by the comment in
dsl_dir_name(). A buffer overrun may have been possible with the
slightly smaller buffer.
2010-06-16 13:49:25 -07:00
b855fb237f
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-16 12:46:20 -07:00
fbe96f9ab0
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-16 12:46:19 -07:00
d30efbdef2
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-16 12:46:08 -07:00
d67b0bd380
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-16 12:46:01 -07:00
0c636b03c0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-16 12:45:25 -07:00
5204c79855
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-16 12:45:03 -07:00
08415a34fb
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-16 12:44:53 -07:00
63bf34ba31
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-16 12:44:19 -07:00
9e35aaedba
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-16 12:44:13 -07:00
4738ecfcdc
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-16 12:44:09 -07:00
1ccdbb250b
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-16 12:44:08 -07:00
31cc6992c5
Merge branch 'fix-stack-dsl_dir_open_spa' into refs/top-bases/fix-branch
2010-06-16 12:40:39 -07:00
0c524122bd
Add fix-stack-dsl_dir_open_spa topic branch
...
Reduce stack usage by 256 bytes by moving buf char array from
the stack to the heap.
2010-06-16 12:39:44 -07:00
4149705c8c
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-16 12:18:57 -07:00
d303d824d6
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-16 12:18:56 -07:00
64b81f7c25
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-16 12:17:51 -07:00
7354ad589b
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-16 12:17:18 -07:00
87af8ae76b
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-16 12:14:37 -07:00
ed15c80b39
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-16 12:13:00 -07:00
70b7065e93
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-16 12:12:28 -07:00
0de95c796f
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-16 12:11:55 -07:00
b8ece25717
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-16 12:11:25 -07:00
9fd12ce4fd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-16 12:11:21 -07:00
2b71569742
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-16 12:11:20 -07:00
877a37d8bd
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-06-16 12:11:18 -07:00
8a001d8f59
Extra uninit vars flagged by gcc 4.1.2
...
Newer versions of the compiler are OK with this but for the sake of
older compilers explicitly initialize them.
2010-06-16 11:45:07 -07:00
916ff9bb97
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-16 10:38:58 -07:00
79577be589
Ensure sys/fm/util.h ia not included
...
Because of events related changes and the need to access zio_cmd_t
we can't unconditionally include sys/fm/util.h as part of zfs_context.h.
2010-06-16 10:34:40 -07:00
3fe3e41259
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-06-16 10:01:06 -07:00
6104e13be6
Add linux-spa-thread topic branch
...
Disable the spa thread under Linux until it can be implemented.
2010-06-16 09:59:39 -07:00
6fa858c778
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-06-16 09:49:06 -07:00
14d073e298
Add linux-sha2 topic branch for portability
...
The upstream ZFS code has correctly moved to a faster native sha2
implementation. Unfortunately, under Linux that's going to be a little
problematic so we revert the code to the more portable version contained
in earlier ZFS releases. Using the native sha2 implementation in Linux
is possible but the API is slightly different in kernel version user
space depending on which libraries are used. Ideally, we need a fast
implementation of SHA256 which builds as part of ZFS this shouldn't be
that hard to do but it will take some effort.
2010-06-16 09:47:25 -07:00
e8e324e048
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 17:00:43 -07:00
5de3a200c4
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 17:00:42 -07:00
55b02e4ca6
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-14 17:00:29 -07:00
bfdcbd7014
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-14 17:00:21 -07:00
f224397b56
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-14 16:59:40 -07:00
09abb3e8ae
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-14 16:59:15 -07:00
2d15a98cb9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
...
Conflicts:
module/zfs/include/sys/dmu.h
2010-06-14 16:59:02 -07:00
5edd772c8c
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-14 16:58:06 -07:00
Brian Behlendorf