linux-next: manual merge of the s390 tree with the dma-mapping tree

--tULI0oFdjPa4iv46
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the s390 tree got a conflict in:

  arch/s390/mm/init.c

between commit:

  30c5e45ee2c53 ("dma-direct: make dma_direct_map_phys() honor DMA_ATTR_CC_=
SHARED")

=66rom the dma-mapping tree and commit:

  28b0d6897484a ("s390/pv: Enable SWIOTLB_ANY for s390 PV")

=66rom the s390 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.

diff --cc arch/s390/mm/init.c
index 8d1de5a2e5549,01050a8e7e05a..0000000000000
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@@ -166,7 -151,7 +166,7 @@@ static void __init pv_init(void
  	virtio_set_mem_acc_cb(virtio_require_restricted_mem_acc);
 =20
  	/* make sure bounce buffers are shared */
- 	swiotlb_init(true, SWIOTLB_VERBOSE);
 -	swiotlb_init(true, SWIOTLB_FORCE | SWIOTLB_VERBOSE | SWIOTLB_ANY);
++	swiotlb_init(true, SWIOTLB_VERBOSE | SWIOTLB_ANY);
  	swiotlb_update_mem_attributes();
  }
 =20

--tULI0oFdjPa4iv46
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmpsqAgACgkQJNaLcl1U
h9DEvwf/Uzt4FvpdmMtgWBJHM4yHMtpsIz/2b/KeO+TVnkgLxZH3+7dm9f5krbVp
W7//zRbmtaQQe3pzpE4AUUrvISpExHmefTi6apynJ7stYp1EEvCCQZzviPkr/YAt
tkV1zDATV/nq9ruPixKkIcBCN/9UyrFncrowcFcqy6UsUTsUFKLLBlNC7FeUTVHP
qQaDsx5hFFzkjtAQc0lpp150JFOtpkHG0SXJvbnrPy/pqQv3wp0Rqx8TQIXFOZUP
QRLQ5zKbpigW/Cid0YLpTqHpCUsrRivzi1XwBZBZlBlUUEFDwz2OQ3bBRiSwuwQx
BJ3WT1TNq2ZOdxgv53toQb4yCZadPg==
=Ib9z
-----END PGP SIGNATURE-----

--tULI0oFdjPa4iv46--