From: Andrew Morton <akpm@linux-foundation.org>
To: Vlastimil Babka <vbabka@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
"Liam R. Howlett" <Liam.Howlett@Oracle.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Lorenzo Stoakes <lorenzo.stoakes@oracle.com>,
Qianfeng Rong <rongqianfeng@vivo.com>
Subject: Re: linux-next: manual merge of the slab tree with the mm-unstable tree
Date: Thu, 4 Sep 2025 14:39:18 -0700 [thread overview]
Message-ID: <20250904143918.dc01310952fe5b3a23deef77@linux-foundation.org> (raw)
In-Reply-To: <1c082ae4-f5a6-4385-8c31-1db2d0890e9c@suse.cz>
On Thu, 4 Sep 2025 10:39:47 +0200 Vlastimil Babka <vbabka@suse.cz> wrote:
> On 9/4/25 08:29, Stephen Rothwell wrote:
> > Hi all,
> >
> > FIXME: Add owner of second tree to To:
> > Add author(s)/SOB of conflicting commits.
> >
> > Today's linux-next merge of the slab tree got a conflict in:
> >
> > tools/testing/vma/vma_internal.h
> >
> > between commit:
> >
> > da018ebb7157 ("tools/testing/vma: clean up stubs in vma_internal.h")
>
> We can solve it by me taking this and
>
> 65d011b2bc05 ("maple_tree: remove redundant __GFP_NOWARN")
>
> from the other thread and Andrew dropping them in mm-unstable. I tried to
> rebase mm-unstable locally while dropping those and there were no conflicts
> and they are self-contained cleanups. AFAIR Andrew was fine with such
> resolutions in the past.
Yep, I generally just drop things when these conflicts occur.
next prev parent reply other threads:[~2025-09-04 21:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-04 6:29 linux-next: manual merge of the slab tree with the mm-unstable tree Stephen Rothwell
2025-09-04 8:39 ` Vlastimil Babka
2025-09-04 21:39 ` Andrew Morton [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-14 4:13 Stephen Rothwell
2025-11-14 5:06 ` Christoph Hellwig
2025-11-14 8:46 ` Vlastimil Babka
2025-11-14 9:13 ` Thomas Weißschuh
2025-11-14 11:55 ` Christoph Hellwig
2025-11-20 13:31 ` Thomas Weißschuh
2025-11-20 17:51 ` Vlastimil Babka
2025-09-04 6:20 Stephen Rothwell
2025-07-21 4:20 Stephen Rothwell
2025-07-21 19:38 ` Matthew Wilcox
2025-07-21 21:35 ` Luiz Capitulino
2025-07-22 8:30 ` Vlastimil Babka
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=20250904143918.dc01310952fe5b3a23deef77@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=Liam.Howlett@Oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lorenzo.stoakes@oracle.com \
--cc=rongqianfeng@vivo.com \
--cc=sfr@canb.auug.org.au \
--cc=vbabka@suse.cz \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox