98dedd03e4
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-12-11 16:21:30 -08:00
b1ebd5aefa
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-12-11 16:21:28 -08:00
31b47d8d8d
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-12-11 16:21:27 -08:00
0fbd8729d4
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-12-11 16:21:25 -08:00
e0f0c48f31
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-12-11 16:21:24 -08:00
ec39f81246
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2009-12-11 16:21:22 -08:00
a83be96d1e
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-12-11 16:21:21 -08:00
e4c253b3e3
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2009-12-11 16:21:19 -08:00
2a5101737e
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2009-12-11 16:21:18 -08:00
404d3c8509
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2009-12-11 16:21:16 -08:00
6be4f70345
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2009-12-11 16:21:15 -08:00
9f1c6b0416
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-12-11 16:21:13 -08:00
912a3fa030
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-12-11 16:21:12 -08:00
69dcaf00f3
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-12-11 16:21:11 -08:00
ac0fb4a24e
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-12-11 16:21:10 -08:00
058ac9ba78
Pull in latest man pages as part of update-zfs.sh
...
The script has been updated to download the latest documentations
packages for Solaris and extract the needed ZFS man pages. These
will still need a little markup to handle changes between the
Solaris and Linux versions of ZFS. Howver, they should be pretty
minor I've tried hard to keep the interface the same.
In additional to the script update the zdb, zfs, and zpool man
pages have been added to the repo.
2009-12-11 16:15:33 -08:00
b76d12a644
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-12-11 12:07:22 -08:00
ba7ccf8ccd
Cast to unsigned long long for 32-bit arches
2009-12-11 11:41:04 -08:00
0f315a58bb
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-11-20 10:29:47 -08:00
3191b962f6
Prevent gcc uninit compiler warning in zfs_range_unlock_reader().
2009-11-20 09:59:58 -08:00
2bee739b4c
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2009-11-15 16:26:30 -08:00
13309c929d
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2009-11-15 16:26:29 -08:00
4ef70c783d
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-11-15 16:26:27 -08:00
ed1f75364a
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2009-11-15 16:26:26 -08:00
d80d6e9bc0
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-11-15 16:26:24 -08:00
123728d9ae
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2009-11-15 16:26:23 -08:00
bb4fcdc504
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-11-15 16:26:21 -08:00
4f9acff2d8
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2009-11-15 16:26:20 -08:00
7de12fa47e
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2009-11-15 16:26:19 -08:00
b5e7e8a1de
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-11-15 16:26:17 -08:00
c79a602d88
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-11-15 16:26:16 -08:00
26844cb8e1
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-11-15 16:26:14 -08:00
9bb3ec458b
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-11-15 16:26:13 -08:00
217998d1a3
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-11-15 16:26:12 -08:00
0ba18e9310
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-11-15 16:26:09 -08:00
ecdec2a90d
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-11-15 16:26:08 -08:00
21e5a5ee85
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-11-15 16:26:06 -08:00
56d2a97b3b
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-11-15 16:26:05 -08:00
a1bac081ee
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2009-11-15 16:26:03 -08:00
109d34244d
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-11-15 16:26:02 -08:00
49468cacf3
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2009-11-15 16:26:00 -08:00
8338a080a8
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2009-11-15 16:25:59 -08:00
a26d57f6f7
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2009-11-15 16:25:57 -08:00
86737ffc6c
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2009-11-15 16:25:56 -08:00
c2b8421841
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-11-15 16:25:55 -08:00
9d03c28169
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-11-15 16:25:53 -08:00
d8aef5d7bc
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-11-15 16:25:52 -08:00
030d49c262
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-11-15 16:25:50 -08:00
0aa61e8427
Remove zvol.c when updating in update-zfs.sh Linux version available.
2009-11-15 16:20:01 -08:00
d8d360724d
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-10-23 12:24:37 -07:00
Brian Behlendorf