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
Date: Tue, 23 Apr 2024 10:42:44 -0700 [thread overview]
Message-ID: <20240423104244.d0108d71eee622b2f9371cfa@linux-foundation.org> (raw)
In-Reply-To: <20240423220317.01d65416@canb.auug.org.au>
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 ;)
prev parent reply other threads:[~2024-04-23 17:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-23 4:59 linux-next: manual merge of the vhost tree with the mm tree Stephen Rothwell
2024-04-23 8:21 ` David Hildenbrand
2024-04-23 9:32 ` Michael S. Tsirkin
2024-04-23 10:05 ` David Hildenbrand
2024-04-23 12:03 ` Stephen Rothwell
2024-04-23 17:42 ` Andrew Morton [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240423104244.d0108d71eee622b2f9371cfa@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=kent.overstreet@linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mst@redhat.com \
--cc=sfr@canb.auug.org.au \
--cc=surenb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.