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

Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.

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

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c
index e13d991e9fb5..b29a8327eed1 100644
--- a/drivers/md/dm-cache-target.c
+++ b/drivers/md/dm-cache-target.c
@@ -3484,14 +3484,13 @@ static int __init dm_cache_init(void)
         int r;
 
         migration_cache = KMEM_CACHE(dm_cache_migration, 0);
-        if (!migration_cache) {
-                dm_unregister_target(&cache_target);
+        if (!migration_cache)
                 return -ENOMEM;
-        }
 
         r = dm_register_target(&cache_target);
         if (r) {
                 DMERR("cache target registration failed: %d", r);
+                kmem_cache_destroy(migration_cache);
                 return r;
         }