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

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  drivers/nvdimm/nd_virtio.c

between commit:

  b381542686726 ("nvdimm: virtio_pmem: serialize flush requests")

from the vhost tree and commit:

  c4ae8ec088db0 ("nvdimm: virtio_pmem: serialize flush requests")

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.

(note that the changes to add out_unlock are dropped)

diff --cc drivers/nvdimm/nd_virtio.c
index 827a17fe7c710,af82385be7c6a..0000000000000
--- a/drivers/nvdimm/nd_virtio.c
+++ b/drivers/nvdimm/nd_virtio.c
@@@ -44,8 -44,7 +44,8 @@@ static int virtio_pmem_flush(struct nd_
  	unsigned long flags;
  	int err, err1;
  
 +	might_sleep();
- 	mutex_lock(&vpmem->flush_lock);
+ 	guard(mutex)(&vpmem->flush_lock);
  
  	/*
  	 * Don't bother to submit the request to the device if the device is

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