linux-kernel - Re: 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20260204141450-mutt-send-email-mst@kernel.org>
Date: Wed, 4 Feb 2026 14:15:02 -0500
From: "Michael S. Tsirkin" <mst@...hat.com>
To: Ira Weiny <ira.weiny@...el.com>
Cc: Mark Brown <broonie@...nel.org>,
	Dan Williams <dan.j.williams@...el.com>, Li Chen <me@...ux.beauty>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the nvdimm tree with the vhost tree

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
>