04f739ff61
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-03-11 09:54:44 -08:00
2f658d8154
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-03-11 09:54:42 -08:00
c007de17e9
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-03-11 09:54:41 -08:00
ca936ff085
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-03-11 09:54:40 -08:00
5389e96149
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-03-11 09:54:39 -08:00
ce96c77fa4
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-03-11 09:54:37 -08:00
14e1411b39
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-03-11 09:54:36 -08:00
931ed94a98
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-03-11 09:54:35 -08:00
ad1bc6c745
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-03-11 09:54:34 -08:00
a579a4ec00
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-03-11 09:54:32 -08:00
5b949f90fa
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-03-11 09:54:31 -08:00
414f1f975e
Rename update-zfs.sh -> zfs-update.sh for consistency
2010-03-11 09:53:59 -08:00
369293803b
Allow recursive configure/make
...
Previously the ZFS configure was dependent on a correct Module{s}.symvers
file which is generated as one of the last steps of the full SPL build.
This meant you could not do a recursive configure because this will
configure all sub-packages before building any of them.
To resolve this issue the ZFS code has been updated to make a very
educated guess as to this file name at configure time. This means
SPL_SYMBOLS may still be used in various places in the build system
such as modules/Makefile.in. But we do give up the ability to
seemlessly detect symbols exported by the SPL at ZFS configure time.
At the moment this is not as issue, hopefully it will stay that way.
2010-03-11 09:45:23 -08:00
7223b8df33
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-10 09:58:04 -08:00
54cf7ab2bc
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-03-10 09:58:03 -08:00
104e33e79b
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-03-10 09:54:44 -08:00
166355dcf0
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-03-10 09:54:43 -08:00
33d6f7ee08
New TopGit dependency: fix-error-handling
2010-03-10 09:54:41 -08:00
62a0ac8f22
Fix some incorrect error handling.
...
In vn_open(), if fstat64() returned an error, the real errno
was being obscured by calling close().
Add error handling for both pwrite64() calls in vn_rdwr().
2010-03-10 09:53:53 -08:00
4853ac3d53
Fix scripts to work when invoked from other directories.
2010-03-09 14:50:15 -08:00
9ac35e4fe5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-09 14:20:05 -08:00
6fb1ab89a6
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-03-09 14:20:04 -08:00
b3928389da
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-03-09 14:20:03 -08:00
3907283e25
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-03-09 14:20:02 -08:00
00cf79214f
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-03-09 14:20:02 -08:00
9ae782821b
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-03-09 14:20:01 -08:00
c3d51e4110
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-03-09 14:20:00 -08:00
df67dd9d47
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-03-09 14:20:00 -08:00
48109ca39e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-03-09 14:19:58 -08:00
a28859f839
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-03-09 14:19:57 -08:00
e7393825e4
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-03-09 14:19:56 -08:00
9acc9e9b20
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-03-09 14:19:56 -08:00
2f0a19285c
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-03-09 14:19:55 -08:00
8521d73733
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-03-09 14:19:54 -08:00
cada9b634c
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-03-09 14:19:53 -08:00
3bacff1e54
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-03-09 14:19:53 -08:00
94ff11c3e0
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-03-09 14:19:52 -08:00
342ab93948
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-03-09 14:19:52 -08:00
75ffcce707
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-03-09 14:19:50 -08:00
4d9d0dbbf0
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-03-09 14:19:50 -08:00
c2931dff76
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2010-03-09 14:19:49 -08:00
889814b195
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-03-09 14:19:49 -08:00
c08729c194
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-03-09 14:19:48 -08:00
be64029df4
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-03-09 14:19:47 -08:00
001f726de5
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-03-09 14:19:46 -08:00
09c493ba56
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-03-09 14:19:45 -08:00
af42419e00
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-03-09 14:19:44 -08:00
e1057463c2
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-03-09 14:19:44 -08:00
f0f4a7a1c2
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2010-03-09 14:19:43 -08:00
ad72ea5360
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-03-09 14:19:43 -08:00
Brian Behlendorf
Ricardo M. Correia