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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20190620163948.0cfdc7c8@canb.auug.org.au>
Date:   Thu, 20 Jun 2019 16:39:48 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Dan Williams <dan.j.williams@...el.com>,
        "Michael S. Tsirkin" <mst@...hat.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Jean-Philippe Brucker <jean-philippe.brucker@....com>,
        Pankaj Gupta <pagupta@...hat.com>
Subject: linux-next: manual merge of the nvdimm tree with the vhost tree

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 */

Content of type "application/pgp-signature" skipped