From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Vlastimil Babka <vbabka@suse•cz>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Peter Zijlstra (Intel)" <peterz@infradead•org>,
Sebastian Andrzej Siewior <bigeasy@linutronix•de>,
"Uladzislau Rezki (Sony)" <urezki@gmail•com>
Subject: Re: linux-next: manual merge of the slab tree with the mm tree
Date: Wed, 22 Jan 2025 14:18:39 +1100 [thread overview]
Message-ID: <20250122141839.6764f7c2@canb.auug.org.au> (raw)
In-Reply-To: <20241216152721.15c5864d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1906 bytes --]
Hi all,
On Mon, 16 Dec 2024 15:27:21 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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@canb•auug.org.au>
> 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@canb•auug.org.au>
> ---
> 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
This is now a conflict between the mm-stable tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-01-22 3:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-16 4:27 linux-next: manual merge of the slab tree with the mm tree Stephen Rothwell
2025-01-22 3:18 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-02 4:34 Stephen Rothwell
2024-01-02 4:02 Stephen Rothwell
2023-12-21 6:34 Stephen Rothwell
2023-11-27 1:29 Stephen Rothwell
2023-06-19 4:03 Stephen Rothwell
2023-06-19 12:16 ` Catalin Marinas
2023-04-05 4:08 Stephen Rothwell
2023-04-05 4:10 ` Yosry Ahmed
2023-03-17 1:44 Stephen Rothwell
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=20250122141839.6764f7c2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=bigeasy@linutronix$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=peterz@infradead$(echo .)org \
--cc=urezki@gmail$(echo .)com \
--cc=vbabka@suse$(echo .)cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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