| Message ID | 20230815180142.07a89703@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: manual merge of the vhost tree with the net-next tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc drivers/net/virtio_net.c index edfd5d8833e4,c9cab3f966db..000000000000 --- a/drivers/net/virtio_net.c
Hi all, Today's linux-next merge of the vhost tree got a conflict in: drivers/net/virtio_net.c between commit: 308d7982dcdc ("virtio_net: extract interrupt coalescing settings to a structure") from the net-next tree and commit: 1a08d66726dc ("virtio_net: merge dma operations when filling mergeable buffers") 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.