Messages in this thread | | | Date | Mon, 12 Oct 2020 19:48:21 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm-current tree with the counters tree |
| |
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/Makefile
between commit:
37a0dbf631f6 ("counters: Introduce counter_atomic* counters")
from the counters tree and commit:
ed7f5253e189 ("mm/page_alloc.c: fix freeing non-compound pages")
from the akpm-current 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 lib/Makefile index 95b357bb5f3c,1c7577b2e86a..000000000000 --- a/lib/Makefile +++ b/lib/Makefile @@@ -99,7 -101,7 +101,8 @@@ obj-$(CONFIG_TEST_BLACKHOLE_DEV) += tes obj-$(CONFIG_TEST_MEMINIT) += test_meminit.o obj-$(CONFIG_TEST_LOCKUP) += test_lockup.o obj-$(CONFIG_TEST_HMM) += test_hmm.o +obj-$(CONFIG_TEST_COUNTERS) += test_counters.o + obj-$(CONFIG_TEST_FREE_PAGES) += test_free_pages.o # # CFLAGS for compiling floating point code inside the kernel. x86/Makefile turns [unhandled content-type:application/pgp-signature] | |