From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Tejun Heo <tj@kernel.org>, Rusty Russell <rusty@rustcorp.com.au>,
Christoph Lameter <cl@linux-foundation.org>,
Ingo Molnar <mingo@elte.hu>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
zijun_hu <zijun_hu@htc.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the percpu tree
Date: Thu, 6 Oct 2016 13:46:36 +1100 [thread overview]
Message-ID: <20161006134636.7505d76e@canb.auug.org.au> (raw)
In-Reply-To: <20161006134357.06fe5655@canb.auug.org.au>
Hi all,
On Thu, 6 Oct 2016 13:43:57 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> mm/percpu.c
>
> between commits:
>
> 93c76b6b2faa ("mm/percpu.c: correct max_distance calculation for pcpu_embed_first_chunk()")
> 9b7396624a7b ("mm/percpu.c: fix potential memory leakage for pcpu_embed_first_chunk()")
>
> from the percpu tree and commit:
>
> 567f646230a5 ("mm/percpu.c: correct max_distance calculation for pcpu_embed_first_chunk()")
>
> from the akpm-current tree.
>
> There is one small differenve between 567f646230a5 and 9b7396624a7b and
> then further changes in 93c76b6b2faa.
Cut an paste error. Should have said:
There is one small difference between 567f646230a5 and 93c76b6b2faa and
then further changes in 9b7396624a7b.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2016-10-06 2:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-06 2:43 linux-next: manual merge of the akpm-current tree with the percpu tree Stephen Rothwell
2016-10-06 2:46 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-07 8:33 Stephen Rothwell
2021-06-08 1:11 ` Roman Gushchin
2021-07-01 3:23 ` Stephen Rothwell
2021-07-01 3:31 ` Dennis Zhou
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=20161006134636.7505d76e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=cl@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rusty@rustcorp.com.au \
--cc=tj@kernel.org \
--cc=zijun_hu@htc.com \
/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