cd77260339
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-03-11 09:55:22 -08:00
553463b261
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-03-11 09:55:21 -08:00
684a27611a
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-03-11 09:55:20 -08:00
c4500bebba
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2010-03-11 09:55:19 -08:00
3c0b90238d
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-03-11 09:55:19 -08:00
747060a2ea
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-03-11 09:55:18 -08:00
08effc0bec
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-03-11 09:55:17 -08:00
4148574b2d
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-03-11 09:55:16 -08:00
a48b62fa95
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-03-11 09:55:16 -08:00
7720159999
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-03-11 09:55:15 -08:00
4deaf5248c
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-03-11 09:55:14 -08:00
3f5b4e49ba
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-03-11 09:55:13 -08:00
c2317af86c
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-03-11 09:55:13 -08:00
4072724702
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-03-11 09:55:12 -08:00
99e94880ad
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-03-11 09:55:11 -08:00
95e5d1c43d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-03-11 09:55:08 -08:00
b6192dfa2c
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-03-11 09:55:07 -08:00
e1b58e733e
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-03-11 09:55:07 -08:00
d6b678d2c2
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2010-03-11 09:55:05 -08:00
b5690a43d2
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-03-11 09:55:04 -08:00
c919132283
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2010-03-11 09:55:03 -08:00
d7e292c232
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-03-11 09:55:01 -08:00
ba3c8033fc
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-03-11 09:55:01 -08:00
2ec833a7a6
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2010-03-11 09:54:59 -08:00
ad2c4c94ae
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2010-03-11 09:54:58 -08:00
91f88418df
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2010-03-11 09:54:56 -08:00
cf4d8c2bbf
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-03-11 09:54:55 -08:00
a4746edfe6
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-03-11 09:54:53 -08:00
a35120184e
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-03-11 09:54:52 -08:00
d0a943ea19
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-03-11 09:54:51 -08:00
61e9ef444e
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-03-11 09:54:50 -08:00
3b66b55e8c
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-03-11 09:54:48 -08:00
deb3da4ad0
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-03-11 09:54:47 -08:00
8731b6820d
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-03-11 09:54:45 -08:00
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
03f51d86b2
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-03-10 12:09:35 -08:00
1859c6aca8
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-03-10 12:09:34 -08:00
20894b4487
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-10 12:09:33 -08:00
Brian Behlendorf