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

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

[Stephen Rothwell]

[-- 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 --]

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

[Mark Brown]

[-- 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 --]

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

[Michael S. Tsirkin]

On Wed, Feb 04, 2026 at 01:17:31PM -0600, Ira Weiny wrote:
> Mark Brown wrote:
> > 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")
> 
> Michael,
> 
> I assume you will drop the v1?
> 
> Ira

just did that.

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

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

[Ira Weiny]

Mark Brown wrote:
> 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")

Michael,

I assume you will drop the v1?

Ira

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