58a80b1cd3
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-05-22 16:38:07 -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
14ca042c97
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-05-22 14:56:34 -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
1fe515a27c
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-05-22 09:38:49 -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
7a17ae41fd
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-20 14:39:27 -07:00
d83c361158
Prep for zfs-0.4.3 tag (Fix spelling)
2009-03-20 14:28:17 -07:00
82549b1466
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-20 14:23:40 -07:00
a7da34e996
Prep for zfs-0.4.3 tag
2009-03-20 14:11:49 -07:00
77d833f35d
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-20 09:32:33 -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
18ee78c902
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-19 21:31:27 -07:00
bd1685ee4e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 21:28:51 -07:00
1769e10f17
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-03-19 21:28:50 -07:00
a891a11671
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-03-19 21:28:48 -07:00
6d883d7d40
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-19 21:28:48 -07:00
63781842e3
Update mutex_lock to pthread_mutex_lock for zcl->zcl_callback_locks.
2009-03-19 21:21:35 -07:00
64684cadfa
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-03-19 21:19:28 -07:00
fed604c844
Add extra () requested by gcc
2009-03-19 21:18:54 -07:00
c141f3113e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-19 21:11:11 -07:00
e7f02d3b41
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 20:59:33 -07:00
eb811f7fa9
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
2009-03-19 20:59:12 -07:00
a71161249a
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 20:57:53 -07:00
c89153393f
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-03-19 20:51:18 -07:00
f180959bac
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-19 20:51:18 -07:00
a32dc3b04b
New TopGit dependency: feature-pthreads
2009-03-19 20:51:17 -07:00
54b5b41a58
Add 'feature-pthreads' branch to features branch.
2009-03-19 20:49:52 -07:00
29703a5b4e
Add 'feature-commit-cb' branch for DMU commit callbacks.
2009-03-19 20:30:14 -07:00
182e9e0973
Remove 'fix-pthreads' dependency from 'fix-branch'
2009-03-19 19:59:10 -07:00
ed846ea072
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-19 19:57:03 -07:00
8c43ad3853
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 19:49:56 -07:00
8cdcf1ef44
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 19:49:55 -07:00
f681a33757
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-03-19 19:49:53 -07:00
05cec154f5
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2009-03-19 19:49:53 -07:00
53db4c7b29
Revert fix-pthreads moving to feature-pthreads branch
2009-03-19 19:43:09 -07:00
cd670610b9
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-19 15:31:18 -07:00
db3436fafe
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 15:29:35 -07:00
2518c98d9e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 15:29:34 -07:00
97d74db433
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-03-19 15:29:33 -07:00
c8c4948d00
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2009-03-19 15:29:33 -07:00
Brian Behlendorf