linux-next: manual merge of the akpm-current tree with the percpu tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the akpm-current tree with the percpu tree
Date	2016-10-06 04:50 +0200
Message-ID	<sp6UV-2mL-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Andrew,

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.

I fixed it up (using the percpu tree version) 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the akpm-current tree with the percpu  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-10-06 04:50 +0200
  Re: linux-next: manual merge of the akpm-current tree with the  percpu tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-10-06 05:00 +0200

csiph-web