On Tue, 29 May 2007 17:31:05 +0100
Michael-Luke Jones <[email protected]> wrote:
> This patch moves the zlib compression and decompression code
> to a common directory. The zutil.h header, which is not meant
> to be public, is moved from include/linux/ to lib/zlib/.
>
> In addition, the PRESET_DICT definition from zutil.h, used by
> fs/jffs2/compr_zlib.c is moved to the 'true' public zlib
> header include/linux/zlib.h.
>
> Conditional compile of only inflate or deflate code is
> preserved by this patch. With a bit of luck, this version
> won't be whitespace-damaged. Grumble.
umm, OK, if you say so. I'm not sure I understand the point behind
all this, but I'm sure there is one ;)
> diff --git a/lib/zlib_deflate/deflate.c b/lib/zlib/deflate.c
> similarity index 100%
> rename from lib/zlib_deflate/deflate.c
> rename to lib/zlib/deflate.c
> index c3e4a2b..1137780 100644
> diff --git a/lib/zlib_deflate/deflate_syms.c b/lib/zlib/deflate_syms.c
> similarity index 100%
> rename from lib/zlib_deflate/deflate_syms.c
> rename to lib/zlib/deflate_syms.c
> diff --git a/lib/zlib_deflate/deftree.c b/lib/zlib/deftree.c
> similarity index 100%
> rename from lib/zlib_deflate/deftree.c
> rename to lib/zlib/deftree.c
> index ddf3482..d5ce87d 100644
> diff --git a/lib/zlib_deflate/defutil.h b/lib/zlib/defutil.h
> similarity index 100%
> rename from lib/zlib_deflate/defutil.h
> rename to lib/zlib/defutil.h
> diff --git a/lib/zlib_inflate/inffast.c b/lib/zlib/inffast.c
> similarity index 100%
> rename from lib/zlib_inflate/inffast.c
> rename to lib/zlib/inffast.c
> diff --git a/lib/zlib_inflate/inftrees.h b/lib/zlib/inftrees.h
> similarity index 100%
> rename from lib/zlib_inflate/inftrees.h
> rename to lib/zlib/inftrees.h
> diff --git a/lib/zlib_inflate/infutil.h b/lib/zlib/infutil.h
> similarity index 100%
> rename from lib/zlib_inflate/infutil.h
> rename to lib/zlib/infutil.h
> diff --git a/include/linux/zutil.h b/lib/zlib/zutil.h
> similarity index 98%
> rename from include/linux/zutil.h
> rename to lib/zlib/zutil.h
> index 6adfa9a..0467c8c 100644
Lots of git goodies there - I didn't actually receive the patch: the parts
which move files around were communicated via git metadata, not diffs.
Presumably there's a way to tell git to not do that.
But probably it's best that this change be merged via git anyway. David,
are you interested in handling it?
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
