3dc39b4640
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-05-22 16:38:53 -07:00
bf426953af
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-05-22 16:38:30 -07:00
2486dd20e5
Set LP64 for powerpc64 and LP32 for just powerpc.
2009-05-22 16:27:59 -07:00
49b845f223
Refresh autogen products
2009-05-22 15:16:05 -07:00
f62bf01b17
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-05-22 15:07:29 -07:00
8bb2e455fb
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-05-22 15:07:27 -07:00
b83a638936
Powerpc64 Compatibility
...
- Add 64-bit user space atomic support obtained from an old version
of OpenSolaris which supported ppc. They are not all 100% fully
implemented by they are a good first step.
- Add powerpc ISA type.
- Strip out unused ISA defines to prevent any confusion.
2009-05-22 15:00:19 -07:00
51b59652a3
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-19 21:13:28 -07:00
37c55dde9f
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-19 21:11:46 -07:00
7f33364d3c
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
module/zfs/dmu_tx.c
module/zfs/txg.c
2009-03-19 21:03:58 -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
54b5b41a58
Add 'feature-pthreads' branch to features branch.
2009-03-19 20:49:52 -07:00
61cd467f6d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-19 19:58:45 -07:00
6af4495583
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-19 19:57:36 -07:00
5e5d31f105
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
2009-03-19 19:52:21 -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
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
a1c694bf03
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-18 13:03:43 -07:00
6ca96b06b4
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-18 13:03:00 -07:00
cc4fbf2c35
Revert to previous behavior zdb fails when unable to open /dev/zfs.
...
For the moment I have added an error message to the failure path to
make it clear what happened. I have also changed the zdb ASSERT to
a VERIFY so we always catch the failure. For now we will just always
ensure the module stack is loaded, longer term we need something a
little more flexible.
2009-03-18 12:48:54 -07:00
3f3dc327fa
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-17 16:07:06 -07:00
9ce6adee54
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-17 16:07:04 -07:00
085d04563d
Add stub header which is missing in new versions of glibc
2009-03-17 15:53:34 -07:00
11003c7e40
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-16 16:23:26 -07:00
57defb44e4
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-16 16:22:34 -07:00
5edabb999f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-16 16:20:02 -07:00
f28a31a09a
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-16 16:18:01 -07:00
df985d53db
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-16 16:17:57 -07:00
f86b52a39d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-16 16:17:55 -07:00
3eebe1bd0e
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-16 16:17:54 -07:00
3eb4ba3ebd
Add 3 more uninit errors detected by gcc 3.4.0 compiler.
2009-03-16 16:06:50 -07:00
15ae49cfcc
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-16 10:43:42 -07:00
ac0ed2b141
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-16 10:42:55 -07:00
6bd672012f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-16 10:39:56 -07:00
c9cff73d9e
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/zpool/zpool_main.c
2009-03-16 10:32:12 -07:00
be112b3f57
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-16 10:30:31 -07:00
5ee8a85ba6
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-16 10:30:27 -07:00
9818e69640
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-03-16 10:12:01 -07:00
2924858552
Remove two self referential functions.
...
Newer versions of gcc (4.3.0) detected the following unused
code segments.
2009-03-16 10:02:06 -07:00
9141a4f2c8
Refresh autogen products
2009-03-13 09:56:09 -07:00
4d5171b7f3
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-13 09:51:42 -07:00
adaf659f27
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-13 09:51:37 -07:00
caba3cb67e
Update specific asm-* arch to generic i386.
...
Depending on your x86 architecture $target_cpu can evaluate to
any of the following (i386|i486|i586|i686). Since our local asm
uses only i386 instructions sed is used to map all of these to
i386 and sets $target_arch. Other arch's are not impacted.
2009-03-13 09:41:55 -07:00
7fa1ced508
Refresh autogen products, remove stray zdump Makefile.in
2009-03-12 16:48:12 -07:00
0fe418c548
Refresh autogen products
2009-03-12 15:55:23 -07:00
6a1223268c
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 15:47:43 -07:00
640eb1d542
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 15:47:07 -07:00
Brian Behlendorf