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

diff --cc drivers/infiniband/core/cm.c
Simple merge

diff --cc drivers/infiniband/core/sa_query.c
Simple merge

diff --cc drivers/infiniband/core/ucm.c
index 02ca642089bdac7c760f532626cbadd3e25f5963,5a6ba4030d44f60869b9789a47ab2e61a9d0629d..28477565ecba8df54012a0562cee7a0eec78b6ef
--- 1/drivers/infiniband/core/ucm.c
--- 2/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@@ -1447,9 -1316,11 +1447,10 @@@ err
  
  static void __exit ib_ucm_cleanup(void)
  {
 -      class_device_destroy(ib_ucm_class, IB_UCM_DEV);
 -      class_destroy(ib_ucm_class);
 -      cdev_del(&ib_ucm_cdev);
 -      unregister_chrdev_region(IB_UCM_DEV, 1);
 +      ib_unregister_client(&ucm_client);
 +      class_unregister(&ucm_class);
 +      unregister_chrdev_region(IB_UCM_BASE_DEV, IB_UCM_MAX_DEVICES);
+       idr_destroy(&ctx_id_table);
  }
  
  module_init(ib_ucm_init);

diff --cc drivers/infiniband/core/uverbs_main.c
Simple merge

diff --cc drivers/infiniband/hw/mthca/mthca_eq.c
Simple merge