[merged] lib-consistency-of-compress-formats-for-kernel-image.patch removed from -mm tree

[akpm@linux-foundation.org]

The patch titled
     Subject: lib/decompress.c: consistency of compress formats for kernel image
has been removed from the -mm tree.  Its filename was
     lib-consistency-of-compress-formats-for-kernel-image.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Haesung Kim <matia.kim@lge.com>
Subject: lib/decompress.c: consistency of compress formats for kernel image

Magic number of compress formats for kernel image is defined by two bytes.
 These numbers are written in hexadecimal number, nevertheless magic
number for only gunzip is written in octal number.  The formats should be
consistent for readability.  Therefore, magic numbers for gunzip are also
defined by hexadecimal number.

Signed-off-by: Haesung Kim <matia.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 lib/decompress.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN lib/decompress.c~lib-consistency-of-compress-formats-for-kernel-image lib/decompress.c
--- a/lib/decompress.c~lib-consistency-of-compress-formats-for-kernel-image
+++ a/lib/decompress.c
@@ -44,8 +44,8 @@ struct compress_format {
 };
 
 static const struct compress_format compressed_formats[] __initconst = {
-	{ {037, 0213}, "gzip", gunzip },
-	{ {037, 0236}, "gzip", gunzip },
+	{ {0x1f, 0x8b}, "gzip", gunzip },
+	{ {0x1f, 0x9e}, "gzip", gunzip },
 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
 	{ {0x5d, 0x00}, "lzma", unlzma },
 	{ {0xfd, 0x37}, "xz", unxz },
_

Patches currently in -mm which might be from matia.kim@lge.com are

origin.patch