Subject: [merged] lib-lz4-correct-the-lz4-license.patch removed from -mm tree
To: rlaager@xxxxxxxxxx,chanho.min@xxxxxxx,kyungsik.lee@xxxxxxx,ryao@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 23 Aug 2013 12:06:21 -0700
The patch titled
Subject: lib/lz4: correct the LZ4 license
has been removed from the -mm tree. Its filename was
lib-lz4-correct-the-lz4-license.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Richard Laager <rlaager@xxxxxxxxxx>
Subject: lib/lz4: correct the LZ4 license
The LZ4 code is listed as using the "BSD 2-Clause License".
Signed-off-by: Richard Laager <rlaager@xxxxxxxxxx>
Acked-by: Kyungsik Lee <kyungsik.lee@xxxxxxx>
Cc: Chanho Min <chanho.min@xxxxxxx>
Cc: Richard Yao <ryao@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/lz4/lz4_compress.c | 4 ++--
lib/lz4/lz4_decompress.c | 6 +++---
lib/lz4/lz4hc_compress.c | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff -puN lib/lz4/lz4_compress.c~lib-lz4-correct-the-lz4-license lib/lz4/lz4_compress.c
--- a/lib/lz4/lz4_compress.c~lib-lz4-correct-the-lz4-license
+++ a/lib/lz4/lz4_compress.c
@@ -437,7 +437,7 @@ int lz4_compress(const unsigned char *sr
exit:
return ret;
}
-EXPORT_SYMBOL_GPL(lz4_compress);
+EXPORT_SYMBOL(lz4_compress);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("Dual BSD/GPL");
MODULE_DESCRIPTION("LZ4 compressor");
diff -puN lib/lz4/lz4_decompress.c~lib-lz4-correct-the-lz4-license lib/lz4/lz4_decompress.c
--- a/lib/lz4/lz4_decompress.c~lib-lz4-correct-the-lz4-license
+++ a/lib/lz4/lz4_decompress.c
@@ -299,7 +299,7 @@ exit_0:
return ret;
}
#ifndef STATIC
-EXPORT_SYMBOL_GPL(lz4_decompress);
+EXPORT_SYMBOL(lz4_decompress);
#endif
int lz4_decompress_unknownoutputsize(const char *src, size_t src_len,
@@ -319,8 +319,8 @@ exit_0:
return ret;
}
#ifndef STATIC
-EXPORT_SYMBOL_GPL(lz4_decompress_unknownoutputsize);
+EXPORT_SYMBOL(lz4_decompress_unknownoutputsize);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("Dual BSD/GPL");
MODULE_DESCRIPTION("LZ4 Decompressor");
#endif
diff -puN lib/lz4/lz4hc_compress.c~lib-lz4-correct-the-lz4-license lib/lz4/lz4hc_compress.c
--- a/lib/lz4/lz4hc_compress.c~lib-lz4-correct-the-lz4-license
+++ a/lib/lz4/lz4hc_compress.c
@@ -533,7 +533,7 @@ int lz4hc_compress(const unsigned char *
exit:
return ret;
}
-EXPORT_SYMBOL_GPL(lz4hc_compress);
+EXPORT_SYMBOL(lz4hc_compress);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("Dual BSD/GPL");
MODULE_DESCRIPTION("LZ4HC compressor");
_
Patches currently in -mm which might be from rlaager@xxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
