linux-next: manual merge of the vhost tree with the net-next tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1507 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/virtio_net.c
index edfd5d8833e4,c9cab3f966db..000000000000
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -127,11 -126,14 +127,19 @@@ static const struct virtnet_stat_desc v
  #define VIRTNET_SQ_STATS_LEN	ARRAY_SIZE(virtnet_sq_stats_desc)
  #define VIRTNET_RQ_STATS_LEN	ARRAY_SIZE(virtnet_rq_stats_desc)
  
 +struct virtnet_interrupt_coalesce {
 +	u32 max_packets;
 +	u32 max_usecs;
 +};
 +
+ /* The dma information of pages allocated at a time. */
+ struct virtnet_rq_dma {
+ 	dma_addr_t addr;
+ 	u32 ref;
+ 	u16 len;
+ 	u16 need_sync;
+ };
+ 
  /* Internal representation of a send virtqueue */
  struct send_queue {
  	/* Virtqueue associated with this send _queue */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]