Merge 3.14-rc5 into driver-core-next

We want the fixes in here.

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 8433de4509c7..a5d21893670d 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -879,14 +879,15 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
         dev->priv_flags |= IFF_MACVLAN;
         err = netdev_upper_dev_link(lowerdev, dev);
         if (err)
-                goto destroy_port;
-
+                goto unregister_netdev;
 
         list_add_tail_rcu(&vlan->list, &port->vlans);
         netif_stacked_transfer_operstate(lowerdev, dev);
 
         return 0;
 
+unregister_netdev:
+        unregister_netdevice(dev);
 destroy_port:
         port->count -= 1;
         if (!port->count)