linux-next: manual merge of the nvdimm tree with the vhost tree

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

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

Hi Dan,

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

  include/uapi/linux/virtio_ids.h

between commit:

  edcd69ab9a32 ("iommu: Add virtio-iommu driver")

from the vhost tree and commit:

  5990fce9c50e ("virtio-pmem: Add virtio pmem driver")

from the nvdimm 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 include/uapi/linux/virtio_ids.h
index cfe47c5d9a56,32b2f94d1f58..000000000000
--- a/include/uapi/linux/virtio_ids.h
+++ b/include/uapi/linux/virtio_ids.h
@@@ -43,6 -43,6 +43,7 @@@
  #define VIRTIO_ID_INPUT        18 /* virtio input */
  #define VIRTIO_ID_VSOCK        19 /* virtio vsock transport */
  #define VIRTIO_ID_CRYPTO       20 /* virtio crypto */
 +#define VIRTIO_ID_IOMMU        23 /* virtio IOMMU */
+ #define VIRTIO_ID_PMEM         27 /* virtio pmem */
  
  #endif /* _LINUX_VIRTIO_IDS_H */

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