Hi,
it would be cool to see the squashfs-xz patches from [1] in 2.6.38?
A lot of distributions use it in combination with AUFS for their
Linux-live-systems.
I have pulled the squashfs-xz tree into linux-next (next-20110111) and
git could automagically solve the conflicts.
But I had to add attached fix.
Kind Regards,
- Sedat -
[1] http://git.kernel.org/?p=linux/kernel/git/pkl/squashfs-xz.git;a=summary
From d84e0ae29382000d54ac1f29d9099c60ccdfa37d Mon Sep 17 00:00:00 2001
From: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Date: Tue, 11 Jan 2011 09:17:36 +0100
Subject: [PATCH] squashfs-xz: Fix misplaced endif after merge
Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
---
fs/squashfs/decompressor.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/squashfs/decompressor.c b/fs/squashfs/decompressor.c
index b7b8c40..e03de0a 100644
--- a/fs/squashfs/decompressor.c
+++ b/fs/squashfs/decompressor.c
@@ -59,11 +59,11 @@ static const struct squashfs_decompressor *decompressor[] = {
&squashfs_zlib_comp_ops,
&squashfs_lzo_comp_ops,
&squashfs_lzma_unsupported_comp_ops,
-#endif
#ifdef CONFIG_SQUASHFS_XZ
&squashfs_xz_comp_ops,
#else
&squashfs_xz_unsupported_comp_ops,
+#endif
&squashfs_unknown_comp_ops
};
--
1.7.4.rc0
