Received-SPF: pass (google.com: domain of linux-kernel+bounces-154791-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Tue, 23 Apr 2024 05:32:01 -0400
From: "Michael S. Tsirkin" <mst@redhat.com>
To: David Hildenbrand <david@redhat.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Andrew Morton <akpm@linux-foundation.org>,
	Kent Overstreet <kent.overstreet@linux.dev>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Suren Baghdasaryan <surenb@google.com>
Subject: Re: linux-next: manual merge of the vhost tree with the mm tree
Message-ID: <20240423053045-mutt-send-email-mst@kernel.org>
References: <20240423145947.142171f6@canb.auug.org.au>
 <e07add5b-e772-4a8c-b71f-79f1fe74580a@redhat.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <e07add5b-e772-4a8c-b71f-79f1fe74580a@redhat.com>

On Tue, Apr 23, 2024 at 10:21:55AM +0200, David Hildenbrand wrote:
> On 23.04.24 06:59, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the vhost tree got a conflict in:
> > 
> >    drivers/virtio/virtio_mem.c
> > 
> > between commit:
> > 
> >    c22e503ced5b ("fix missing vmalloc.h includes")
> > 
> > from the mm-unstable branch of the mm tree and commit:
> > 
> >    4ba509048975 ("virtio-mem: support suspend+resume")
> > 
> > from the vhost 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.
> > 
> 
> Easy header conflict. @MST, @Andrew, do we simply want to take that
> virtio-mem patch via the MM tree to get rid of the conflict completely?

ok by me:

Acked-by: Michael S. Tsirkin <mst@redhat.com>

Andrew if you pick this let me know pls and I will drop it.

> -- 
> Cheers,
> 
> David / dhildenb