Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 23 Apr 2021 17:23:51 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>,
        Vineet Gupta <Vineet.Gupta1@synopsys.com>
Cc:     Jesper Dangaard Brouer <brouer@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        "Matthew Wilcox (Oracle)" <willy@infradead.org>,
        Mel Gorman <mgorman@techsingularity.net>
Subject: linux-next: manual merge of the akpm-current tree with the
 arc-current tree
Message-ID: <20210423172351.4e3d194b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/fr=4dr_nSKP_h.7QceCVhCC";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/fr=4dr_nSKP_h.7QceCVhCC
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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_po=
ol_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.

--=20
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 =3D 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;
+=20
 -	page->dma_addr =3D dma;
 +	page_pool_set_dma_addr(page, dma);
 =20
  	if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV)
  		page_pool_dma_sync_for_device(pool, page, pool->p.max_len);

--Sig_/fr=4dr_nSKP_h.7QceCVhCC
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmCCdgcACgkQAVBC80lX
0Gxd+Qf/fE0F3C20Q0Gh2N8r160GKZbSzU4iCf7hSQ6REtqKjJMKiaHELXSUxLbN
yWx0WZ2o8r45lO4PQB0GMQKh2Mv8KWDzCZEAvvBWzCAYkFg8s5NA6Vqwbaiuk8Gg
ssknG29OcUcnWdqcCaZqY+Zd91nh26TU/Erza74RPEHuv6hl3SZtWFmIEta1s7DF
avDaNazDpL78amVaq90lCiWURP2+Kid8RGYbxTPf7SKM/KySCUuZwVVYVJ+vuW9l
A4iSviZoYaX20izcWVJJ1dMWzu7oGQe/hjeR9ThN8EKp1i5Oro3OBwH4k69/puiu
Ctuob8+whEfsCczggybAAaZKG/XCow==
=qH94
-----END PGP SIGNATURE-----

--Sig_/fr=4dr_nSKP_h.7QceCVhCC--