diff --git a/kernel/tools/perf/files/patches/linux/patch-5.6.10.xz b/kernel/tools/perf/files/patches/linux/patch-5.6.10.xz new file mode 100644 index 0000000000..f140f37f4a Binary files /dev/null and b/kernel/tools/perf/files/patches/linux/patch-5.6.10.xz differ diff --git a/kernel/tools/perf/files/patches/mageia/fs-exfat-fix-discard-support.patch b/kernel/tools/perf/files/patches/mageia/fs-exfat-fix-discard-support.patch new file mode 100644 index 0000000000..5de9917c40 --- /dev/null +++ b/kernel/tools/perf/files/patches/mageia/fs-exfat-fix-discard-support.patch @@ -0,0 +1,32 @@ +From: =?UTF-8?q?Pali=20Roh=C3=A1r?= +Subject: [PATCH 4/4] exfat: Fix discard support +Date: Tue, 17 Mar 2020 23:25:55 +0100 + +Discard support was always unconditionally disabled. Now it is disabled +only in the case when blk_queue_discard() returns false. + +Signed-off-by: Pali Rohár +--- + fs/exfat/super.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/fs/exfat/super.c b/fs/exfat/super.c +index 16ed202ef527..30e914ad17b5 100644 +--- a/fs/exfat/super.c ++++ b/fs/exfat/super.c +@@ -531,10 +531,11 @@ static int exfat_fill_super(struct super_block *sb, struct fs_context *fc) + if (opts->discard) { + struct request_queue *q = bdev_get_queue(sb->s_bdev); + +- if (!blk_queue_discard(q)) ++ if (!blk_queue_discard(q)) { + exfat_msg(sb, KERN_WARNING, + "mounting with \"discard\" option, but the device does not support discard"); +- opts->discard = 0; ++ opts->discard = 0; ++ } + } + + sb->s_flags |= SB_NODIRATIME; +-- +2.20.1 diff --git a/kernel/tools/perf/pspec.xml b/kernel/tools/perf/pspec.xml index 5d62965516..2c0ab1227a 100644 --- a/kernel/tools/perf/pspec.xml +++ b/kernel/tools/perf/pspec.xml @@ -42,7 +42,7 @@ - patches/linux/patch-5.6.4.xz + patches/linux/patch-5.6.10.xz patches/mageia/fs-aufs-5.6.patch patches/mageia/fs-aufs-5.6-modular.patch @@ -62,6 +62,7 @@ patches/mageia/fs-MAINTAINERS-add-exfat-filesystem.patch patches/mageia/fs-exfat-update-file-system-parameter-handling.patch patches/mageia/fs-exfat-add-module_alias_fs.patch + patches/mageia/fs-exfat-fix-discard-support.patch patches/mageia/CVE-2019-12379.patch @@ -96,6 +97,13 @@ + + 2020-05-04 + 5.6.10 + Version bump. + Idris Kalp + idriskalp@gmail.com + 2020-04-13 5.6.4