Subject: [folded-merged] crypto-add-lz4-cryptographic-api-fix.patch removed from -mm tree
To: akpm@xxxxxxxxxxxxxxxxxxxx,chanho.min@xxxxxxx,djwong@xxxxxxxxxx,fengguang.wu@xxxxxxxxx,herbert@xxxxxxxxxxxxxxxxxxxx,kyungsik.lee@xxxxxxx,richard@xxxxxx,rpearson@xxxxxxxxxxxxxxxxxxxxx,yann.collet.73@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 08 Jul 2013 15:35:21 -0700
The patch titled
Subject: crypto-add-lz4-cryptographic-api-fix
has been removed from the -mm tree. Its filename was
crypto-add-lz4-cryptographic-api-fix.patch
This patch was dropped because it was folded into crypto-add-lz4-cryptographic-api.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: crypto-add-lz4-cryptographic-api-fix
fix warnings
Reported-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Cc: "Darrick J. Wong" <djwong@xxxxxxxxxx>
Cc: Bob Pearson <rpearson@xxxxxxxxxxxxxxxxxxxxx>
Cc: Chanho Min <chanho.min@xxxxxxx>
Cc: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxxx>
Cc: Kyungsik Lee <kyungsik.lee@xxxxxxx>
Cc: Richard Weinberger <richard@xxxxxx>
Cc: Yann Collet <yann.collet.73@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
crypto/lz4.c | 3 ++-
crypto/lz4hc.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff -puN crypto/lz4.c~crypto-add-lz4-cryptographic-api-fix crypto/lz4.c
--- a/crypto/lz4.c~crypto-add-lz4-cryptographic-api-fix
+++ a/crypto/lz4.c
@@ -66,8 +66,9 @@ static int lz4_decompress_crypto(struct
{
int err;
size_t tmp_len = *dlen;
+ size_t __slen = slen;
- err = lz4_decompress(src, &slen, dst, tmp_len);
+ err = lz4_decompress(src, &__slen, dst, tmp_len);
if (err < 0)
return -EINVAL;
diff -puN crypto/lz4hc.c~crypto-add-lz4-cryptographic-api-fix crypto/lz4hc.c
--- a/crypto/lz4hc.c~crypto-add-lz4-cryptographic-api-fix
+++ a/crypto/lz4hc.c
@@ -66,8 +66,9 @@ static int lz4hc_decompress_crypto(struc
{
int err;
size_t tmp_len = *dlen;
+ size_t __slen = slen;
- err = lz4_decompress(src, &slen, dst, tmp_len);
+ err = lz4_decompress(src, &__slen, dst, tmp_len);
if (err < 0)
return -EINVAL;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths.patch
mm-remove-duplicated-call-of-get_pfn_range_for_nid.patch
memcg-use-css_get-put-when-charging-uncharging-kmem.patch
panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks.patch
shm-fix-null-pointer-deref-when-userspace-specifies-invalid-hugepage-size-fix.patch
ipc-utilc-ipc_rcu_alloc-cacheline-align-allocation.patch
partitions-add-aix-lvm-partition-support-files.patch
reboot-arm-change-reboot_mode-to-use-enum-reboot_mode.patch
lib-add-lz4-compressor-module.patch
crypto-add-lz4-cryptographic-api.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
