From: Sasha Levin <sashal@kernel.org>
To: sj@kernel.org, akpm@linux-foundation.org,
brendan.higgins@linux.dev, davidgow@davidgow.net,
usamaarif642@gmail.com
Cc: stable@vger.kernel.org
Subject: FAILED: patch "[PATCH] mm/damon/sysfs-schemes: use switch-case in add_scheme_filters()" failed to apply to 5.15-stable tree
Date: Sat, 7 Nov 2026 06:04:37 -0500 [thread overview]
Message-ID: <20261107060436-failed-5.15-cec08aad3def@kernel.org> (raw)
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x cec08aad3def79bdb7a795a05e7c9a11d577b4f8
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '20261107060436-failed-5.15-cec08aad3def@kernel.org' --subject-prefix 'PATCH 5.15.y' 'HEAD^..'
Thanks,
Sasha
------------------ original commit in Linus's tree ------------------
From cec08aad3def79bdb7a795a05e7c9a11d577b4f8 Mon Sep 17 00:00:00 2001
From: SJ Park <sj@kernel.org>
Date: Mon, 14 Sep 2026 07:23:23 -0700
Subject: [PATCH] mm/damon/sysfs-schemes: use switch-case in
add_scheme_filters()
damon_sysfs_add_scheeme_filters() has long if-else chains for DAMOS filter
types. Convert the code to use switch-case, which would be cleaner and
more efficient.
Link: https://lore.kernel.org/20260914142327.92510-7-sj@kernel.org
Signed-off-by: SJ Park <sj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Brendan Higgins <brendan.higgins@linux.dev>
Cc: David Gow <davidgow@davidgow.net>
Cc: Usama Arif <usamaarif642@gmail.com>
Cc: <stable@vger.kernel.org>
---
mm/damon/sysfs-schemes.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/mm/damon/sysfs-schemes.c b/mm/damon/sysfs-schemes.c
index a4ec5d54cfbd1..bfb6f0bc3f213 100644
--- a/mm/damon/sysfs-schemes.c
+++ b/mm/damon/sysfs-schemes.c
@@ -2822,7 +2822,8 @@ static int damon_sysfs_add_scheme_filters(struct damos *scheme,
if (!filter)
return -ENOMEM;
- if (filter->type == DAMOS_FILTER_TYPE_MEMCG) {
+ switch (filter->type) {
+ case DAMOS_FILTER_TYPE_MEMCG:
err = damon_sysfs_memcg_path_to_id(
sysfs_filter->memcg_path,
&filter->memcg_id);
@@ -2830,16 +2831,23 @@ static int damon_sysfs_add_scheme_filters(struct damos *scheme,
damos_destroy_filter(filter);
return err;
}
- } else if (filter->type == DAMOS_FILTER_TYPE_ADDR) {
+ break;
+ case DAMOS_FILTER_TYPE_ADDR:
filter->addr_range = sysfs_filter->addr_range;
- } else if (filter->type == DAMOS_FILTER_TYPE_TARGET) {
+ break;
+ case DAMOS_FILTER_TYPE_TARGET:
filter->target_idx = sysfs_filter->target_idx;
- } else if (filter->type == DAMOS_FILTER_TYPE_HUGEPAGE_SIZE) {
+ break;
+ case DAMOS_FILTER_TYPE_HUGEPAGE_SIZE:
filter->sz_range.min = sysfs_filter->range_min;
filter->sz_range.max = sysfs_filter->range_max;
- } else if (filter->type == DAMOS_FILTER_TYPE_PROBE_HITS_WSUM) {
+ break;
+ case DAMOS_FILTER_TYPE_PROBE_HITS_WSUM:
filter->range_min = sysfs_filter->range_min;
filter->range_max = sysfs_filter->range_max;
+ break;
+ default:
+ break;
}
damos_add_filter(scheme, filter);
--
2.53.0
reply other threads:[~2026-11-07 11:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261107060436-failed-5.15-cec08aad3def@kernel.org \
--to=sashal@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=brendan.higgins@linux.dev \
--cc=davidgow@davidgow.net \
--cc=sj@kernel.org \
--cc=stable@vger.kernel.org \
--cc=usamaarif642@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox