[folded-merged] mm-treewide-rename-kzfree-to-kfree_sensitive-fix-fix.patch removed from -mm tree

[folded-merged] mm-treewide-rename-kzfree-to-kfree_sensitive-fix-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm-treewide-rename-kzfree-to-kfree_sensitive-fix-fix
has been removed from the -mm tree.  Its filename was
     mm-treewide-rename-kzfree-to-kfree_sensitive-fix-fix.patch

This patch was dropped because it was folded into mm-treewide-rename-kzfree-to-kfree_sensitive.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-treewide-rename-kzfree-to-kfree_sensitive-fix-fix

fix fs/crypto/inline_crypt.c some more

Cc: Waiman Long <longman@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/crypto/inline_crypt.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/fs/crypto/inline_crypt.c~mm-treewide-rename-kzfree-to-kfree_sensitive-fix-fix
+++ a/fs/crypto/inline_crypt.c
@@ -188,7 +188,7 @@ int fscrypt_prepare_inline_crypt_key(str
 fail:
 	for (i = 0; i < queue_refs; i++)
 		blk_put_queue(blk_key->devs[i]);
-	kzfree_sensitive(blk_key);
+	kfree_sensitive(blk_key);
 	return err;
 }
 
@@ -202,7 +202,7 @@ void fscrypt_destroy_inline_crypt_key(st
 			blk_crypto_evict_key(blk_key->devs[i], &blk_key->base);
 			blk_put_queue(blk_key->devs[i]);
 		}
-		kzfree_sensitive(blk_key);
+		kfree_sensitive(blk_key);
 	}
 }
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-treewide-rename-kzfree-to-kfree_sensitive.patch
mm-handle-page-mapping-better-in-dump_page-fix.patch
mm-thp-replace-http-links-with-https-ones-fix.patch
mm.patch
mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix.patch
mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix-fix.patch
mm-hugetlb-add-mempolicy-check-in-the-reservation-routine-fix.patch
mm-vmstat-add-events-for-thp-migration-without-split-fix.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
mm-migrate-clear-__gfp_reclaim-to-make-the-migration-callback-consistent-with-regular-thp-allocations-fix.patch
mm-migrate-make-a-standard-migration-target-allocation-function-fix.patch
mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch