From: Linus Torvalds Date: Thu, 24 Mar 2011 15:02:21 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus X-Git-Tag: v5.15~25843 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5818fcc8bd1b27af4d40b8357b91a56cc3fae6a4;p=mirror_ubuntu-kernels.git 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: Use vmalloc rather than kmalloc for zlib workspace Squashfs: handle corruption of directory structure Squashfs: wrap squashfs_mount() definition Squashfs: xz_wrapper doesn't need to include squashfs_fs_i.h anymore Squashfs: Update documentation to include compression options Squashfs: Update Kconfig help text to include xz compression Squashfs: add compression options support to xz decompressor Squashfs: extend decompressor framework to handle compression options --- 5818fcc8bd1b27af4d40b8357b91a56cc3fae6a4