a799d209d3
Merge commit 'refs/remotes/origin/linux-have-mntent' into HEAD
2009-06-26 14:34:28 -07:00
4fbded409d
Merge commit '0f1012be0aeb6f5f27966c80321db79a9b1aaec3' into zfs-branch
2009-06-26 14:33:53 -07:00
137276e3c9
Should be powerpc64 not powerpc (powerpc is unsupported)
2009-06-26 14:29:42 -07:00
99682cad91
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-06-09 16:27:20 -07:00
0f1012be0a
Add basic zlib autoconf check for user space build.
2009-06-09 16:09:17 -07:00
09c21c632a
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-06-09 14:41:41 -07:00
999035eb32
Only powerpc64 is currently supported not powerpc.
2009-06-09 14:20:44 -07:00
18bd989532
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-06-08 16:24:55 -07:00
9c347d872f
Core target arch support for conditional compilation of SUBDIRs
...
which is used by libspl for it's arch specific atomic implementations.
2009-06-08 16:07:43 -07:00
9823df1da3
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-06-08 12:18:03 -07:00
4253416b7d
Refresh for consistency with COPYRIGHT
2009-06-08 11:59:13 -07:00
e8d18ed6c5
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-06-08 11:21:52 -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
f2f1b9fbbe
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-05-22 16:37:00 -07:00
e1d6e67473
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-05-22 16:36:23 -07:00
9c53917bd5
Merge commit 'refs/top-bases/zfs-branch' into 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
0d807a8545
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-05-22 14:55:30 -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
016306198f
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-05-22 09:37:45 -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
6b45777d1c
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-20 14:37:21 -07:00
d83c361158
Prep for zfs-0.4.3 tag (Fix spelling)
2009-03-20 14:28:17 -07:00
b7e4515745
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-20 14:21:18 -07:00
a7da34e996
Prep for zfs-0.4.3 tag
2009-03-20 14:11:49 -07:00
b6c72e1597
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-20 09:30:27 -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
66f41d5cc6
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-19 21:29:47 -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
ddd2898eed
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-19 21:06:59 -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
Brian Behlendorf