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

[Vineet Gupta]

On 4/23/21 12:23 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
>    net/core/page_pool.c
>
> between commit:
>
>    004f078a57d3 ("mm: Fix struct page layout on 32-bit systems")
>
> from the arc-current tree and commit:
>
>    8fdd71a69f19 ("net: page_pool: refactor dma_map into own function page_pool_dma_map")
>
> 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.

Sorry this was a snafu at my end - I pushed wrong local branch (to test 
Matthew's changes)
Its fixed now.

Thx,
-Vineet