Drop docg3 patch that requires missing function devm_kasprintf() I could add it, but this is not a high-priority fix.
diff --git a/queue-3.16/mtd-docg3-fix-a-possible-memory-leak-of-mtd-name.patch b/queue-3.16/mtd-docg3-fix-a-possible-memory-leak-of-mtd-name.patch deleted file mode 100644 index 70beabd..0000000 --- a/queue-3.16/mtd-docg3-fix-a-possible-memory-leak-of-mtd-name.patch +++ /dev/null
@@ -1,38 +0,0 @@ -From: YueHaibing <yuehaibing@huawei.com> -Date: Fri, 25 Jan 2019 10:12:42 +0800 -Subject: mtd: docg3: fix a possible memory leak of mtd->name - -commit b0dd77a796423ad3c609b6708260adca85a0798f upstream. - -In case DOC_CHIPID_G3, mtd->name is not freed in err handling path, -which is alloced by kasprintf(). Fix this by using devm_kasprintf(). - -Fixes: ae9d4934b2d7 ("mtd: docg3: add multiple floor support") -Signed-off-by: YueHaibing <yuehaibing@huawei.com> -Signed-off-by: Boris Brezillon <bbrezillon@kernel.org> -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> ---- - drivers/mtd/devices/docg3.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - ---- a/drivers/mtd/devices/docg3.c -+++ b/drivers/mtd/devices/docg3.c -@@ -1833,8 +1833,8 @@ static int __init doc_set_driver_info(in - - switch (chip_id) { - case DOC_CHIPID_G3: -- mtd->name = kasprintf(GFP_KERNEL, "docg3.%d", -- docg3->device_id); -+ mtd->name = devm_kasprintf(docg3->dev, GFP_KERNEL, "docg3.%d", -+ docg3->device_id); - if (!mtd->name) - return -ENOMEM; - docg3->max_block = 2047; -@@ -1953,7 +1953,6 @@ static void doc_release_device(struct mt - mtd_device_unregister(mtd); - kfree(docg3->bbt); - kfree(docg3); -- kfree(mtd->name); - kfree(mtd); - } -
diff --git a/queue-3.16/series b/queue-3.16/series index c93018d..cc7f2a8 100644 --- a/queue-3.16/series +++ b/queue-3.16/series
@@ -37,7 +37,6 @@ mtd-docg3-don-t-leak-docg3-bbt-in-error-path.patch mtd-docg3-fix-kasprintf-usage.patch mtd-docg3-fix-passing-zero-to-ptr_err-warning-in-doc_probe_device.patch -mtd-docg3-fix-a-possible-memory-leak-of-mtd-name.patch tty-ipwireless-fix-potential-null-pointer-dereference.patch ext2-fix-underflow-in-ext2_max_size.patch devres-always-use-dev_name-in-devm_ioremap_resource.patch