linux-next: manual merge of the vfio tree with the s390 tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1909 bytes --]

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

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

  drivers/s390/crypto/vfio_ap_private.h

between commit:

  49b0109fb399 ("s390/vfio-ap: introduce shadow APCB")

from the s390 tree and commit:

  ce4b4657ff18 ("vfio: Replace the DMA unmapping notifier with a callback")

from the vfio 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 drivers/s390/crypto/vfio_ap_private.h
index 2d03871597bf,abb59d59f81b..000000000000
--- a/drivers/s390/crypto/vfio_ap_private.h
+++ b/drivers/s390/crypto/vfio_ap_private.h
@@@ -97,9 -81,6 +97,7 @@@ struct ap_queue_table 
   * @node:	allows the ap_matrix_mdev struct to be added to a list
   * @matrix:	the adapters, usage domains and control domains assigned to the
   *		mediated matrix device.
 + * @shadow_apcb:    the shadow copy of the APCB field of the KVM guest's CRYCB
-  * @iommu_notifier: notifier block used for specifying callback function for
-  *		    handling the VFIO_IOMMU_NOTIFY_DMA_UNMAP even
   * @kvm:	the struct holding guest's state
   * @pqap_hook:	the function pointer to the interception handler for the
   *		PQAP(AQIC) instruction.
@@@ -114,8 -90,6 +112,7 @@@ struct ap_matrix_mdev 
  	struct vfio_device vdev;
  	struct list_head node;
  	struct ap_matrix matrix;
 +	struct ap_matrix shadow_apcb;
- 	struct notifier_block iommu_notifier;
  	struct kvm *kvm;
  	crypto_hook pqap_hook;
  	struct mdev_device *mdev;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]