Hi all,
Today's linux-next merge of the slab tree got a conflict in:
kernel/rcu/tree.c
between commit:
e20b770a87b4 ("kasan: make kasan_record_aux_stack_noalloc() the default behaviour")
from the mm-unstable branch of the mm tree and commit:
c44d336ad5ba ("mm/slab: Move kvfree_rcu() into SLAB")
from the slab tree.
I fixed it up (I used the former and applied the following patch) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 16 Dec 2024 15:23:41 +1100
Subject: [PATCH] fix up for "mm/slab: Move kvfree_rcu() into SLAB"
interacting with commit
"kasan: make kasan_record_aux_stack_noalloc() the default behaviour"
form the mm tree.
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
mm/slab_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/slab_common.c b/mm/slab_common.c
index 69f2d19010de..4030907b6b7d 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -1944,7 +1944,7 @@ void kvfree_call_rcu(struct rcu_head *head, void *ptr)
return;
}
- kasan_record_aux_stack_noalloc(ptr);
+ kasan_record_aux_stack(ptr);
success = add_ptr_to_bulk_krc_lock(&krcp, &flags, ptr, !head);
if (!success) {
run_page_cache_worker(krcp);
--
2.45.2
--
Cheers,
Stephen Rothwell
Attachment:
pgpXP0s5T7_np.pgp
Description: OpenPGP digital signature
