lkml.org 
[lkml]   [2025]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the slab tree with the mm-unstable tree
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.

\
 
 \ /
  Last update: 2025-09-04 23:40    [from the cache]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and my Meterkast|Read the blog