Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)

drivers/infiniband/core/cm.c

@@ -3338,6 +3338,7 @@ static void __exit ib_cm_cleanup(void)
 	flush_workqueue(cm.wq);
 	destroy_workqueue(cm.wq);
 	ib_unregister_client(&cm_client);
+	idr_destroy(&cm.local_id_table);
 }
 
 module_init(ib_cm_init);