Messages in this thread | | | Date | Tue, 23 Apr 2024 14:59:47 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the vhost tree with the mm tree |
| |
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.
-- Cheers, Stephen Rothwell
diff --cc drivers/virtio/virtio_mem.c index e8355f55a8f7,6d4dfbc53a66..000000000000 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@@ -21,7 -21,7 +21,8 @@@ #include <linux/bitmap.h> #include <linux/lockdep.h> #include <linux/log2.h> +#include <linux/vmalloc.h> + #include <linux/suspend.h> #include <acpi/acpi_numa.h> [unhandled content-type:application/pgp-signature] | |