[lkml]   [2018]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the akpm-current tree with the powerpc tree
On Thu, Dec 06, 2018 at 05:44:17PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
> Today's linux-next merge of the akpm-current tree got conflicts in:
> arch/powerpc/include/asm/book3s/32/pgalloc.h
> arch/powerpc/include/asm/nohash/32/pgalloc.h
> arch/powerpc/mm/pgtable-book3s64.c
> between commits:
> a95d133c8643 ("powerpc/mm: Move pte_fragment_alloc() to a common location")
> 32ea4c149990 ("powerpc/mm: Extend pte_fragment functionality to PPC32")
> from the powerpc tree and commit:
> 913c2d755b39 ("mm: treewide: remove unused address argument from pte_alloc functions")
> from the akpm-current tree.
> I fixed it up (see below, plus the extra merge fix patch) 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.

The conflict resolution looks good to me.

Reviewed-by: Joel Fernandes (Google) <>


- Joel

 \ /
  Last update: 2018-12-07 02:43    [W:0.033 / U:4.820 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site