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

[Mark Brown]

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")

from the dma-mapping tree and commit:

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

from 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);
  
  	/* 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();
  }

Attachment: signature.asc
Description: PGP signature