contrib/check-config: fix MEMCG_SWAP checking#50555
Merged
thaJeztah merged 2 commits intomoby:masterfrom Aug 5, 2025
Merged
Conversation
CONFIG_MEMCG_SWAP has been deprecated since kernel v5.8-rc1 (commit 2d1c498) and removed since kernel v6.1-rc1 (commit e55b9f9). Since kernel v5.8-rc1, swap tracking has been an integral part of memory control. CONFIG_MEMCG_SWAP becomes invisible to user and simply means CONFIG_MEMCG && CONFIG_SWAP. Disable the check for kernel v5.8+. Signed-off-by: 纯真 <38834411+chunzhennn@users.noreply.github.com>
Signed-off-by: 纯真 <38834411+chunzhennn@users.noreply.github.com>
Member
robmry
approved these changes
Aug 5, 2025
Contributor
robmry
left a comment
There was a problem hiding this comment.
LGTM - thank you @chunzhennn.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
- What I did
CONFIG_MEMCG_SWAP has been deprecated since kernel v5.8-rc1 (commit 2d1c498) and removed since kernel v6.1-rc1 (commit e55b9f9).
Since kernel v5.8-rc1, swap tracking has been an integral part of memory control. CONFIG_MEMCG_SWAP becomes invisible to user and simply means CONFIG_MEMCG && CONFIG_SWAP.
This PR disables the check for kernel v5.8+, and fixes a tiny bug in kernel version range check.
Closes #49231 .
I made mistakes in branch name of #50553 , so I opened another PR.
- A picture of a cute animal (not mandatory but encouraged)
ฅ^•ﻌ•^ฅ