Received-SPF: pass (google.com: domain of linux-kernel+bounces-155698-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Tue, 23 Apr 2024 10:42:44 -0700
From: Andrew Morton <akpm@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Hildenbrand <david@redhat.com>, "Michael S. Tsirkin"
 <mst@redhat.com>, 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: <20240423104244.d0108d71eee622b2f9371cfa@linux-foundation.org>
In-Reply-To: <20240423220317.01d65416@canb.auug.org.au>
References: <20240423145947.142171f6@canb.auug.org.au>
	<e07add5b-e772-4a8c-b71f-79f1fe74580a@redhat.com>
	<20240423220317.01d65416@canb.auug.org.au>
Precedence: bulk
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Tue, 23 Apr 2024 22:03:17 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> On Tue, 23 Apr 2024 10:21:55 +0200 David Hildenbrand <david@redhat.com> wrote:
> >
> > 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?
> 
> And because it is so trivial a conflict, you should just mention it to
> Linus when you send the merge requests.

Yes, let's leave things as they are.  We have to give Linus *something*
to do ;)