26bea36f61
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-06-08 13:24:19 -07:00
2968e197aa
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-06-08 13:24:17 -07:00
96da8b0db7
Add missing EXPORT_SYMBOL() to dmu_tx_callback_register().
2009-06-08 13:08:14 -07:00
80ded7f6a2
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-06-08 12:20:07 -07:00
fcc24de42b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-06-08 12:20:05 -07:00
cc652f2c35
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-06-08 12:19:20 -07:00
4253416b7d
Refresh for consistency with COPYRIGHT
2009-06-08 11:59:13 -07:00
debf672431
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-06-08 11:23:48 -07:00
511ab7cb47
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-06-08 11:23:46 -07:00
cbeb9b8f88
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-06-08 11:23:04 -07:00
e8880abb13
Readd accidentally dropped COPYRIGHT, it just references the
...
OPENSOLARIS.LICENSE but it should still be in place.
2009-06-08 11:01:13 -07:00
a0cbacda86
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-05-22 16:37:31 -07:00
df6c8453b0
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-05-22 16:37:30 -07:00
40e75795ca
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-05-22 16:37:19 -07:00
9c53917bd5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-05-22 16:36:23 -07:00
e1d6e67473
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-05-22 16:36:23 -07:00
9c59a63d91
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-05-22 16:36:22 -07:00
e56aa929e8
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-05-22 16:36:22 -07:00
8e9605062a
Explictly use signed char for portability. On x86/x86_64
...
systems the default char type is signed, on ppc/ppc64 systems
the default char type is unsigned.
2009-05-22 16:30:47 -07:00
3444299103
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-05-22 14:55:59 -07:00
d0049c1466
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-05-22 14:55:59 -07:00
3edeaa92a8
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-05-22 14:55:47 -07:00
119a28815f
- Update build system to SPL_META_VERSION not VERSION.
...
- ZFS_LINUX_COMPILE_IFELSE drop explicit CC and force the kernel build
system to set it this ensure -m64 is set only when appropriate.
2009-05-22 14:49:41 -07:00
0ade7e7652
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-05-22 09:38:15 -07:00
ac5fd0cf8e
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-05-22 09:38:14 -07:00
dd1c357f20
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-05-22 09:38:03 -07:00
d855b57b7c
SLES Fixes (Part 1):
...
- ZFS_AC_KERNEL updated to exclude -obj entries in /usr/src/ when
attempting to automatically detect your kernel source.
- ZFS_AC_KERNEL check for *-obj directory when attempting to
detect the objects for your kernel source.
- ZFS_AC_SPL updated to additionally check for Modules.symvers build
product. This seems to be specific to SLES system, for Vanilla,
Fedora, RHEL, and Chaos kernels the symbol file is just called
Module.symvers.
- ZFS_CHECK_SYMBOL_EXPORT also should also check the exported SPL
symbols in addition to the exported core kernel systems.
2009-05-22 09:26:36 -07:00
cc0a52c939
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-20 14:38:19 -07:00
daa5c38101
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-20 14:38:18 -07:00
a08ea6e0a7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-20 14:37:56 -07:00
d83c361158
Prep for zfs-0.4.3 tag (Fix spelling)
2009-03-20 14:28:17 -07:00
11978efb62
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-20 14:22:21 -07:00
e1fc193990
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-20 14:22:20 -07:00
1072e031f6
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-20 14:21:53 -07:00
a7da34e996
Prep for zfs-0.4.3 tag
2009-03-20 14:11:49 -07:00
cc5ce72296
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-20 13:26:38 -07:00
f47473638b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-20 13:26:36 -07:00
9bee47e648
Export additional txg_* symbols.
2009-03-20 13:17:23 -07:00
fe14e8358c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-20 09:31:25 -07:00
8f44809fd0
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-20 09:31:22 -07:00
dddcb5433e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-20 09:31:02 -07:00
f53e5a851d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-20 09:29:22 -07:00
0c88bc3ccd
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-03-20 09:29:21 -07:00
fe77fb7907
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-03-20 09:29:17 -07:00
9476bd93ca
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-20 09:29:17 -07:00
13814fe220
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-03-20 09:29:16 -07:00
99da5f93e8
Fix uninitialized variable error in ztest_dmu_commit_callbacks()
2009-03-20 09:20:49 -07:00
8c8e10d491
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-19 21:30:35 -07:00
18569f4b9e
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-19 21:30:34 -07:00
61914d7403
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-19 21:30:15 -07:00
Brian Behlendorf