diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 22:50:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 22:50:35 -0700 |
| commit | 91d44d99992ff2587104df5760bfffbb3564b3c2 (patch) | |
| tree | 71316dfc11385f5594962f91d7192fdd851e86a8 /Documentation | |
| parent | 2dad3206db5c3832cde1f58650027fea3ff7adf3 (diff) | |
| parent | cc6d3497141adedb71de8ddce62bf4cd4817832d (diff) | |
| download | linux-91d44d99992ff2587104df5760bfffbb3564b3c2.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
Squashfs: Make ZLIB compression support optional
Squashfs: Update documentation for XZ and add squashfs-tools devel tree
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/squashfs.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/filesystems/squashfs.txt b/Documentation/filesystems/squashfs.txt index d4d41465a0b1..7db3ebda5a4c 100644 --- a/Documentation/filesystems/squashfs.txt +++ b/Documentation/filesystems/squashfs.txt @@ -2,7 +2,7 @@ SQUASHFS 4.0 FILESYSTEM ======================= Squashfs is a compressed read-only filesystem for Linux. -It uses zlib/lzo compression to compress files, inodes and directories. +It uses zlib/lzo/xz compression to compress files, inodes and directories. Inodes in the system are very small and all blocks are packed to minimise data overhead. Block sizes greater than 4K are supported up to a maximum of 1Mbytes (default block size 128K). @@ -55,6 +55,8 @@ create populated squashfs filesystems. This and other squashfs utilities can be obtained from http://www.squashfs.org. Usage instructions can be obtained from this site also. +The squashfs-tools development tree is now located on kernel.org + git://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git 3. SQUASHFS FILESYSTEM DESIGN ----------------------------- |