From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Jul 2019 17:52:08 +0000 (-0700)
Subject: Merge tag 'libnvdimm-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f8c3500cd137867927bc080f4a6e02e0222dd1b8;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'libnvdimm-for-5.3' of git://git./linux/kernel/git/nvdimm/nvdimm

Pull libnvdimm updates from Dan Williams:
 "Primarily just the virtio_pmem driver:

   - virtio_pmem

     The new virtio_pmem facility introduces a paravirtualized
     persistent memory device that allows a guest VM to use DAX
     mechanisms to access a host-file with host-page-cache. It arranges
     for MAP_SYNC to be disabled and instead triggers a host fsync()
     when a 'write-cache flush' command is sent to the virtual disk
     device.

   - Miscellaneous small fixups"

* tag 'libnvdimm-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  virtio_pmem: fix sparse warning
  xfs: disable map_sync for async flush
  ext4: disable map_sync for async flush
  dax: check synchronous mapping is supported
  dm: enable synchronous dax
  libnvdimm: add dax_dev sync flag
  virtio-pmem: Add virtio pmem driver
  libnvdimm: nd_region flush callback support
  libnvdimm, namespace: Drop uuid_t implementation detail
---

f8c3500cd137867927bc080f4a6e02e0222dd1b8
diff --cc include/uapi/linux/virtio_ids.h
index cfe47c5d9a56,32b2f94d1f58..348fd0176f75
--- 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 */