Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	net/ipv6/xfrm6_output.c
	net/openvswitch/flow_netlink.c
	net/openvswitch/vport-gre.c
	net/openvswitch/vport-vxlan.c
	net/openvswitch/vport.c
	net/openvswitch/vport.h

The openvswitch conflicts were overlapping changes.  One was
the egress tunnel info fix in 'net' and the other was the
vport ->send() op simplification in 'net-next'.

The xfrm6_output.c conflicts was also a simplification
overlapping a bug fix.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 9bf63c27a9b7..441b158d04f7 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1706,19 +1706,19 @@ static void xennet_destroy_queues(struct netfront_info *info)
 }
 
 static int xennet_create_queues(struct netfront_info *info,
-                                unsigned int num_queues)
+                                unsigned int *num_queues)
 {
         unsigned int i;
         int ret;
 
-        info->queues = kcalloc(num_queues, sizeof(struct netfront_queue),
+        info->queues = kcalloc(*num_queues, sizeof(struct netfront_queue),
                                GFP_KERNEL);
         if (!info->queues)
                 return -ENOMEM;
 
         rtnl_lock();
 
-        for (i = 0; i < num_queues; i++) {
+        for (i = 0; i < *num_queues; i++) {
                 struct netfront_queue *queue = &info->queues[i];
 
                 queue->id = i;
@@ -1728,7 +1728,7 @@ static int xennet_create_queues(struct netfront_info *info,
                 if (ret < 0) {
                         dev_warn(&info->netdev->dev,
                                  "only created %d queues\n", i);
-                        num_queues = i;
+                        *num_queues = i;
                         break;
                 }
 
@@ -1738,11 +1738,11 @@ static int xennet_create_queues(struct netfront_info *info,
                         napi_enable(&queue->napi);
         }
 
-        netif_set_real_num_tx_queues(info->netdev, num_queues);
+        netif_set_real_num_tx_queues(info->netdev, *num_queues);
 
         rtnl_unlock();
 
-        if (num_queues == 0) {
+        if (*num_queues == 0) {
                 dev_err(&info->netdev->dev, "no queues\n");
                 return -EINVAL;
         }
@@ -1788,7 +1788,7 @@ static int talk_to_netback(struct xenbus_device *dev,
         if (info->queues)
                 xennet_destroy_queues(info);
 
-        err = xennet_create_queues(info, num_queues);
+        err = xennet_create_queues(info, &num_queues);
         if (err < 0)
                 goto destroy_ring;