Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 1 insertions, 9 deletions

diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 1bc654a73c47..eae4ad749e9d 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -207,20 +207,12 @@ static __net_init int loopback_net_init(struct net *net)
 out_free_netdev:
         free_netdev(dev);
 out:
-        if (net == &init_net)
+        if (net_eq(net, &init_net))
                 panic("loopback: Failed to register netdevice: %d\n", err);
         return err;
 }
 
-static __net_exit void loopback_net_exit(struct net *net)
-{
-        struct net_device *dev = net->loopback_dev;
-
-        unregister_netdev(dev);
-}
-
 /* Registered in net/core/dev.c */
 struct pernet_operations __net_initdata loopback_net_ops = {
        .init = loopback_net_init,
-       .exit = loopback_net_exit,
 };