From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2F8C61DDC37 for ; Sat, 18 Jul 2026 01:21:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784337721; cv=none; b=owGokyyOK8Ap2kAmGA5+WU3HlISAT4qt88mA6S87m7LZ095f++MfKaQJfWPDkvgKj31KTgHSt270iu26SyOphGy2HBdwmucz2J/rahAC2fcVuYMNVBqHWm4v+xjMcwEDjaow0nXzJ72clz7NhjCCOp+gCxkfkMgJvjA0sxm9TTI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784337721; c=relaxed/simple; bh=1YOHAeNg+CoGtxlw/NPmnRl3W5aj31yjil2wbSSoBxg=; h=Date:To:From:Subject:Message-Id; b=MlpZAi6LR0k2Qe/Hnam4oDOVDm81wDAgVCmmpmOBUWOR7MKxYbEgD25XHA25cIoV675vxPwbayj9QPfVLIc+6gsoaccXqy4uBMZFQbWsrPBw+wYCFu1vFsZWCXKVANmCRtfleHQhw9SUoxeUhl+22InGZB74NJNBDm1QDkZ5vtc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=DjSqywf+; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="DjSqywf+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ADF581F000E9; Sat, 18 Jul 2026 01:21:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1784337719; bh=rypAYgRVYQp2yODtHkYf0iCovxzDq3ROBsGSragGPV0=; h=Date:To:From:Subject; b=DjSqywf++ntl1H/brSl8ujDNWSwF+DCdPEyQXr8MYBTXNdKfiHhOBxNYcJD0W9c3n DruPUYBY4enWnnLKr2V/dHXipVYbl8VW6N052SRhTsMJPvBFNKj1q55uMtElNqCQ85 f4e7XxyzfG/CckQ+14Q482+HYIAGex6FZWEGKPGQ= Date: Fri, 17 Jul 2026 18:21:59 -0700 To: mm-commits@vger.kernel.org,shikemeng@huaweicloud.com,nphamcs@gmail.com,kasong@tencent.com,chrisl@kernel.org,baoquan.he@linux.dev,baohua@kernel.org,lihongfu@kylinos.cn,akpm@linux-foundation.org From: Andrew Morton Subject: + mm-swap-fix-swap_cluster_lock-config_swap-stub-signature-mismatch.patch added to mm-new branch Message-Id: <20260718012159.ADF581F000E9@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: mm/swap: fix swap_cluster_lock() !CONFIG_SWAP stub signature mismatch has been added to the -mm mm-new branch. Its filename is mm-swap-fix-swap_cluster_lock-config_swap-stub-signature-mismatch.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-swap-fix-swap_cluster_lock-config_swap-stub-signature-mismatch.patch This patch will later appear in the mm-new branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Note, mm-new is a provisional staging ground for work-in-progress patches, and acceptance into mm-new is a notification for others take notice and to finish up reviews. Please do not hesitate to respond to review feedback and post updated versions to replace or incrementally fixup patches in mm-new. The mm-new branch of mm.git is not included in linux-next If a few days of testing in mm-new is successful, the patch will me moved into mm.git's mm-unstable branch, which is included in linux-next Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via various branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there most days ------------------------------------------------------ From: Hongfu Li Subject: mm/swap: fix swap_cluster_lock() !CONFIG_SWAP stub signature mismatch Date: Fri, 17 Jul 2026 15:11:04 +0800 The !CONFIG_SWAP stub for swap_cluster_lock() has mismatched prototype: it has an extra unused irq argument and uses pgoff_t instead of unsigned long for offset. All callers are under CONFIG_SWAP so the extra parameter is dead. Delete the unused stub function entirely. Link: https://lore.kernel.org/20260717071104.73467-1-hongfu.li@linux.dev Signed-off-by: Hongfu Li Reviewed-by: Baoquan He Acked-by: Kairui Song Cc: Barry Song Cc: Chris Li Cc: Hongfu Li Cc: Kemeng Shi Cc: Nhat Pham Signed-off-by: Andrew Morton --- mm/swap.h | 5 ----- 1 file changed, 5 deletions(-) --- a/mm/swap.h~mm-swap-fix-swap_cluster_lock-config_swap-stub-signature-mismatch +++ a/mm/swap.h @@ -344,11 +344,6 @@ void swap_update_readahead(struct folio unsigned long addr); #else /* CONFIG_SWAP */ -static inline struct swap_cluster_info *swap_cluster_lock( - struct swap_info_struct *si, pgoff_t offset, bool irq) -{ - return NULL; -} static inline struct swap_cluster_info *swap_cluster_get_and_lock( struct folio *folio) _ Patches currently in -mm which might be from lihongfu@kylinos.cn are selftests-mm-move-pkey-selftest-helpers-to-pkey_utilc.patch selftests-mm-unify-pkey-sighandler-selftest-assertions-and-tracing.patch selftests-mm-use-pkey_assert-on-clone_raw-failure-in-pkey-test.patch selftests-mm-add-missing-mmap-return-checks-in-pkey-tests.patch selftests-mm-add-missing-pthread_create-return-checks-in-pkey-tests.patch selftests-mm-fix-clone-cleartid-race-in-pkey-sighandler-tests.patch selftests-mm-fix-memleak-in-migration-benchmark.patch selftests-mm-factor-out-hmm_buffer_alloc-to-consolidate-buffer-setup.patch selftests-mm-fix-bug_on-checking-wrong-variable-in-mremap_dontunmap.patch mm-swap-fix-swap_cluster_lock-config_swap-stub-signature-mismatch.patch