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

[Stephen Rothwell]

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.

-- 
Cheers,
Stephen Rothwell

diff --cc net/core/page_pool.c
index f014fd8c19a6,9ec1aa9640ad..000000000000
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c
@@@ -224,11 -192,10 +194,10 @@@ static bool page_pool_dma_map(struct pa
  	dma = dma_map_page_attrs(pool->p.dev, page, 0,
  				 (PAGE_SIZE << pool->p.order),
  				 pool->p.dma_dir, DMA_ATTR_SKIP_CPU_SYNC);
- 	if (dma_mapping_error(pool->p.dev, dma)) {
- 		put_page(page);
- 		return NULL;
- 	}
+ 	if (dma_mapping_error(pool->p.dev, dma))
+ 		return false;
+ 
 -	page->dma_addr = dma;
 +	page_pool_set_dma_addr(page, dma);
  
  	if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV)
  		page_pool_dma_sync_for_device(pool, page, pool->p.max_len);

Attachment: pgpsAByyAziIH.pgp
Description: OpenPGP digital signature