From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Vlastimil Babka <vbabka@suse•cz>,
Andrew Morton <akpm@linux-foundation•org>
Cc: "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>
Subject: linux-next: manual merge of the slab tree with the mm-unstable tree
Date: Thu, 4 Sep 2025 16:29:51 +1000 [thread overview]
Message-ID: <20250904162951.365fa2ea@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 934 bytes --]
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")
from the mm-unstable tree and commits:
cbb6a30df135 ("tools/testing/vma: Implement vm_refcnt reset")
6602bcbdfbad ("tools/testing: Add support for changes to slab for sheaves")
from the slab tree.
I fixed it up (I used the latter version) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-04 6:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-04 6:29 Stephen Rothwell [this message]
2025-09-04 8:39 ` linux-next: manual merge of the slab tree with the mm-unstable tree Vlastimil Babka
2025-09-04 21:39 ` Andrew Morton
-- 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=20250904162951.365fa2ea@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Liam.Howlett@Oracle$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lorenzo.stoakes@oracle$(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