Hi all,
On Thu, 6 Oct 2016 13:43:57 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
