From: David Hildenbrand <david@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
"Michael S. Tsirkin" <mst@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>
Cc: 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:21:55 +0200 [thread overview]
Message-ID: <e07add5b-e772-4a8c-b71f-79f1fe74580a@redhat.com> (raw)
In-Reply-To: <20240423145947.142171f6@canb.auug.org.au>
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?
--
Cheers,
David / dhildenb
next prev parent reply other threads:[~2024-04-23 8:22 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 [this message]
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
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=e07add5b-e772-4a8c-b71f-79f1fe74580a@redhat.com \
--to=david@redhat.com \
--cc=akpm@linux-foundation.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox