Subject: [merged] drivers-block-loopc-fix-comment-typo-in-loop_config_discard.patch removed from -mm tree To: olaf@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 23 Jan 2014 12:42:46 -0800 The patch titled Subject: drivers/block/loop.c: fix comment typo in loop_config_discard has been removed from the -mm tree. Its filename was drivers-block-loopc-fix-comment-typo-in-loop_config_discard.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Olaf Hering <olaf@xxxxxxxxx> Subject: drivers/block/loop.c: fix comment typo in loop_config_discard Discard requests are ignored if the encryption is enabled for the given loop device. Update comment to match the code, and similar comments elsewhere in the file. Signed-off-by: Olaf Hering <olaf@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/loop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/block/loop.c~drivers-block-loopc-fix-comment-typo-in-loop_config_discard drivers/block/loop.c --- a/drivers/block/loop.c~drivers-block-loopc-fix-comment-typo-in-loop_config_discard +++ a/drivers/block/loop.c @@ -798,7 +798,7 @@ static void loop_config_discard(struct l /* * We use punch hole to reclaim the free space used by the - * image a.k.a. discard. However we do support discard if + * image a.k.a. discard. However we do not support discard if * encryption is enabled, because it may give an attacker * useful information. */ _ Patches currently in -mm which might be from olaf@xxxxxxxxx are origin.patch linux-next.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