From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Liam Howlett <liam.howlett@oracle.com>, Mike Rapoport <rppt@kernel.org>
Cc: Karolina Drobnik <karolinadrobnik@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: linux-next: manual merge of the maple tree with the memblock tree
Date: Thu, 17 Feb 2022 17:16:38 +1100 [thread overview]
Message-ID: <20220217171638.084b6321@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1649 bytes --]
Hi all,
Today's linux-next merge of the maple tree got a conflict in:
tools/testing/radix-tree/Makefile
between commit:
5a198c3f9b0b ("tools: Move gfp.h and slab.h from radix-tree to lib")
from the memblock tree and commits:
4af8015a7707 ("Maple Tree: Add new data structure")
f6955b248f29 ("lib/test_maple_tree: Add testing for maple tree")
from the maple tree.
I fixed it up (see below) 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
diff --cc tools/testing/radix-tree/Makefile
index c4ea4fbb0bfc,3e0fa6ae0e0a..000000000000
--- a/tools/testing/radix-tree/Makefile
+++ b/tools/testing/radix-tree/Makefile
@@@ -4,9 -4,8 +4,9 @@@ CFLAGS += -I. -I../../include -g -Og -W
-fsanitize=undefined
LDFLAGS += -fsanitize=address -fsanitize=undefined
LDLIBS+= -lpthread -lurcu
- TARGETS = main idr-test multiorder xarray
+ TARGETS = main idr-test multiorder xarray maple
-CORE_OFILES := xarray.o radix-tree.o idr.o linux.o test.o find_bit.o bitmap.o maple.o
+CORE_OFILES := xarray.o radix-tree.o idr.o linux.o test.o find_bit.o bitmap.o \
- slab.o
++ slab.o maple.o
OFILES = main.o $(CORE_OFILES) regression1.o regression2.o regression3.o \
regression4.o tag_check.o multiorder.o idr-test.o iteration_check.o \
iteration_check_2.o benchmark.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-02-17 6:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-17 6:16 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-02-23 0:06 linux-next: manual merge of the maple tree with the memblock tree broonie
2022-02-17 6:22 Stephen Rothwell
2022-02-17 6:12 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=20220217171638.084b6321@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=karolinadrobnik@gmail.com \
--cc=liam.howlett@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rppt@kernel.org \
--cc=willy@infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).