From: Andrew Morton <akpm@linux-foundation.org>
To: mm-commits@vger.kernel.org,minchan@kernel.org,dmaluka@chromium.org,senozhatsky@chromium.org,akpm@linux-foundation.org
Subject: [folded-merged] zram-split-memory-tracking-and-ac-time-tracking-v2.patch removed from -mm tree
Date: Sun, 10 Dec 2023 16:44:32 -0800 [thread overview]
Message-ID: <20231211004432.BBDC8C433C8@smtp.kernel.org> (raw)
The quilt patch titled
Subject: zram-split-memory-tracking-and-ac-time-tracking-v2
has been removed from the -mm tree. Its filename was
zram-split-memory-tracking-and-ac-time-tracking-v2.patch
This patch was dropped because it was folded into zram-split-memory-tracking-and-ac-time-tracking.patch
------------------------------------------------------
From: Sergey Senozhatsky <senozhatsky@chromium.org>
Subject: zram-split-memory-tracking-and-ac-time-tracking-v2
Date: Fri, 17 Nov 2023 10:35:20 +0900
ifdef fixup, per Dmytro
Link: https://lkml.kernel.org/r/20231117013543.540280-1-senozhatsky@chromium.org
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Dmytro Maluka <dmaluka@chromium.org>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/block/zram/Kconfig | 2 +-
drivers/block/zram/zram_drv.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/block/zram/Kconfig~zram-split-memory-tracking-and-ac-time-tracking-v2
+++ a/drivers/block/zram/Kconfig
@@ -74,7 +74,7 @@ config ZRAM_TRACK_ENTRY_ACTIME
depends on ZRAM
help
With this feature zram tracks access time of every stored
- entry (page), which can be used for a more fine-grained IDLE
+ entry (page), which can be used for a more fine grained IDLE
pages writeback.
config ZRAM_MEMORY_TRACKING
--- a/drivers/block/zram/zram_drv.c~zram-split-memory-tracking-and-ac-time-tracking-v2
+++ a/drivers/block/zram/zram_drv.c
@@ -301,7 +301,7 @@ static void mark_idle(struct zram *zram,
zram_slot_lock(zram, index);
if (zram_allocated(zram, index) &&
!zram_test_flag(zram, index, ZRAM_UNDER_WB)) {
-#ifdef ZRAM_TRACK_ENTRY_ACTIME
+#ifdef CONFIG_ZRAM_TRACK_ENTRY_ACTIME
is_idle = !cutoff || ktime_after(cutoff,
zram->table[index].ac_time);
#endif
_
Patches currently in -mm which might be from senozhatsky@chromium.org are
zram-split-memory-tracking-and-ac-time-tracking.patch
zram-tweak-writeback-config-help.patch
zram-use-kmap_local_page.patch
checkpatch-do-not-require-an-empty-line-before-error-injection.patch
reply other threads:[~2023-12-11 0:44 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=20231211004432.BBDC8C433C8@smtp.kernel.org \
--to=akpm@linux-foundation.org \
--cc=dmaluka@chromium.org \
--cc=minchan@kernel.org \
--cc=mm-commits@vger.kernel.org \
--cc=senozhatsky@chromium.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.