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

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
drivers/net/virtio_net.c between commit 9bb8ca86075f ("virtio-net: switch
to use XPS to choose txq") from the net-next tree and commit 827da44c6141
("net: Explicitly initialize u64_stats_sync structures for lockdep") from
the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/net/virtio_net.c
index 7d0eff710913,ee384f3d612b..000000000000
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -1584,6 -1569,18 +1584,14 @@@ static int virtnet_probe(struct virtio_
  	if (vi->stats == NULL)
  		goto free;
  
+ 	for_each_possible_cpu(i) {
+ 		struct virtnet_stats *virtnet_stats;
+ 		virtnet_stats = per_cpu_ptr(vi->stats, i);
+ 		u64_stats_init(&virtnet_stats->tx_syncp);
+ 		u64_stats_init(&virtnet_stats->rx_syncp);
+ 	}
+ 
+ 
 -	vi->vq_index = alloc_percpu(int);
 -	if (vi->vq_index == NULL)
 -		goto free_stats;
 -
  	mutex_init(&vi->config_lock);
  	vi->config_enable = true;
  	INIT_WORK(&vi->config_work, virtnet_config_changed_work);

Attachment: pgpsDonOj8yPY.pgp
Description: PGP signature