Messages in this thread | | | Date | Tue, 23 Apr 2024 10:21:55 +0200 | Subject | Re: linux-next: manual merge of the vhost tree with the mm tree | From | David Hildenbrand <> |
| |
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
| |