From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Shuah Khan <skhan@linuxfoundation•org>
Cc: Andrew Morton <akpm@linux-foundation•org>,
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: Re: linux-next: manual merge of the akpm-current tree with the counters tree
Date: Thu, 15 Oct 2020 16:53:10 +1100 [thread overview]
Message-ID: <20201015165310.45b5d7be@canb.auug.org.au> (raw)
In-Reply-To: <20201012194821.4eeaffab@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]
Hi all,
On Mon, 12 Oct 2020 19:48:21 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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.
>
> 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
This is now a conflict between the counters tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2020-10-15 5:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 8:48 linux-next: manual merge of the akpm-current tree with the counters tree Stephen Rothwell
2020-10-15 5:53 ` Stephen Rothwell [this message]
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=20201015165310.45b5d7be@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=skhan@linuxfoundation$(echo .)org \
--cc=willy@infradead$(echo .)org \
/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