From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 532192236F2 for ; Wed, 4 Feb 2026 19:15:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770232511; cv=none; b=bkcZNlYieprVk0bqDByg5V8mGzOWgnQ5CZeOVPA2kpO1BD7XZ5L+olJao7n7lRbqdgcjFYB/E3KSDzc3i99qQ3OJLseuJ/9BREmtUUTlOeNIPeTv05THVzj9fMDzChIDI/+kjy+w8DJV4F+xsabRxb1fryy31qvZ5Ftg7THWJKo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770232511; c=relaxed/simple; bh=QwXMpvEjpmwlx5iZRshD+ibL+awMEH7eTVeraZrvIN0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=PlJO+bsJMUieSOzYGcY1tWrhpPXlPfkquWkfLEicM1J0G+hdUwzmP6Bt7wTdjGMoamgGfQdTHn5LiVfVhUObQUWSPDINCU6gxqvtCkGe/0zVAviGpUz/BlVP/ffg8MZLg8hoss//ZcuFZERjk73S3ztPXGNyx8bXaY8toiD3BCg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=LHdCh8Yx; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=DJY5bcgn; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LHdCh8Yx"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="DJY5bcgn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770232510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Tqmai0XOq22QbtgtcTu8Te/h8pcU3CnbiTMqhAWwGCo=; b=LHdCh8YxLzYzGL/QDUoBWfRkOHNfNPduKSetwBGWP8GXYYQFZKrZnusKabw/vqmS3YwvED sCbCfpdjX21f1vavaxU2qzs7Vfr6NNsxUv/689NKQfaG5K/QZOTsMXURoYGxjik71IUw1b 1XzioseU0ymoftup4F+ZW2v03UxVfts= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-600-4g4H1h0CPeyQwlyAjspHUg-1; Wed, 04 Feb 2026 14:15:09 -0500 X-MC-Unique: 4g4H1h0CPeyQwlyAjspHUg-1 X-Mimecast-MFC-AGG-ID: 4g4H1h0CPeyQwlyAjspHUg_1770232507 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-435ab9ed85dso139568f8f.1 for ; Wed, 04 Feb 2026 11:15:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1770232507; x=1770837307; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=Tqmai0XOq22QbtgtcTu8Te/h8pcU3CnbiTMqhAWwGCo=; b=DJY5bcgn8yJNAGZjo9FUL+A3Pcb+WgJcv+9ZPyb6oSMWNvv02lPPOC/zRtlLFw5jrY xzTu0hcf/n3bDDgG3bCdqleKtAH2Wx3N9bYqKQ+A8YfF3pGGiegK8TvGyOshK4T1j4/4 wOQnO5ChF0RHn4Gai0bBFoLpo5m3ZWbiQohRy++aoTrdqFywJQIXwtj+2Td62d7mQRHd MsK+e5/NbqL34kS4tae8tlU8NYfzhFwN3EsTzMw+ZauZXWO+KVtCWlNprpHs8/ZIR6mi 8M6d72EzPTz4luME+wO0wwc2o2w/K2bSxz0G0IoHFYrVLsIywiEmv9Lx90Mh3pBWvZGc hCuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770232507; x=1770837307; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Tqmai0XOq22QbtgtcTu8Te/h8pcU3CnbiTMqhAWwGCo=; b=w646QOi0b5IIPBNl8p/dTGVwiryr32q9cDTa+Bktz1OUiBcCAoQ5J08Z8JVnUqQzv3 fmvBX2AzH9Eh9AIWYd0CMEQm4fuBlKd7K9aS2hNhqKhkoc/NywqlVgzLEEZvKxdLWYJL X0Nttzc7UrE93A0Lvxr5DkeJMthgjuN7eVgsND0mCdaaFKlBDFMz251ETuN7WwS6RhUG 3jBrT/XtkuYsxvFNdJUp7R85y7bYnBMEqbu3AXMieLIMiZx7sgt1uuDW+7KVfBPQ9UFV tYRtawenJBzlPreAR7x8XnjvT/TeOKAKFPHddWENY0KgIrP3vXr7Cal8rD7aYr+l/Wv+ DPIg== X-Forwarded-Encrypted: i=1; AJvYcCUji3MGUDCeUJ89Ce1PY2DJw0uZ8yFAxS9M2gb43vTq8NkDaFH0btdXbntANaWysE7n89AsZPqVChAaFBg=@vger.kernel.org X-Gm-Message-State: AOJu0YwFZ9SN7vF6cw/1B055SeIYHYL4EC41JcdFWeU/zha7Hf1vn5lB 0B+yc0o/uf2sPpfvlUdD0ziAjgmiPKA+HQvAwC7+W/90OLP/OsoGeKR2PFIqNDKeYv3YFha0tOx MZaFqZnhreCk8FJKqsAjss6Wb5k1Vo51N6it0DcU6g5AielqKzPAGTtY9GDRcLxkH0g== X-Gm-Gg: AZuq6aJC13ts3obU5mUjGgbluiOLEUScb9cO6NghODfL8bGenoVp/CpTNi4EgSMSKP/ fDH/sXF6g61wmuJarX4e7fS/wAxqrHEuHHjrBP+AYLYWwUavVVJ7t7fG9zHSzXXDYuVZ+5R8PUO GmN4uJboDvUWDLFaXEi6ZbqwJwGJzWzOkkMht8RxisANEk1aM/7yFZhZAg/2B75Q+tXHGI10Z0q wCRf5uhkc2Zb/JqhVHejSod78xMioueCzGSbm1SCvW+9Qw1XK3n/wlyuFazkf8bBJo29GaeIl2F RkTcIqp2PfdV0Ngl8uZs+na3kBclNcqe81FIDi0AkM0fxHfWwkeG8Ruutwae991qb/9GjwJQF+7 q+LWZeHhkPRmwyE2PukmS4pXjm73wZiBZLA== X-Received: by 2002:a05:6000:2881:b0:435:a135:7772 with SMTP id ffacd0b85a97d-43617e35407mr5586049f8f.4.1770232506626; Wed, 04 Feb 2026 11:15:06 -0800 (PST) X-Received: by 2002:a05:6000:2881:b0:435:a135:7772 with SMTP id ffacd0b85a97d-43617e35407mr5586015f8f.4.1770232506117; Wed, 04 Feb 2026 11:15:06 -0800 (PST) Received: from redhat.com (IGLD-80-230-34-155.inter.net.il. [80.230.34.155]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43617e25d0dsm8601974f8f.7.2026.02.04.11.15.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Feb 2026 11:15:05 -0800 (PST) Date: Wed, 4 Feb 2026 14:15:02 -0500 From: "Michael S. Tsirkin" To: Ira Weiny Cc: Mark Brown , Dan Williams , Li Chen , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the nvdimm tree with the vhost tree Message-ID: <20260204141450-mutt-send-email-mst@kernel.org> References: <69839b4bdf198_58e21100f@iweiny-mobl.notmuch> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <69839b4bdf198_58e21100f@iweiny-mobl.notmuch> 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 >