Merge branch 'uverbs_dev_cleanups' into rdma.git for-next
authorJason Gunthorpe <jgg@mellanox.com>
Wed, 5 Sep 2018 22:21:22 +0000 (16:21 -0600)
committerJason Gunthorpe <jgg@mellanox.com>
Wed, 5 Sep 2018 22:21:22 +0000 (16:21 -0600)
commit2c910cb75e1fe6de52d95c8e32caedd1629a33a5
tree94a0eea6f8cde689d11e7583ddd0a930b8785ab4
parent627212c9d49ba2759b699450f5d8f45f73e062fa
parentb53b1c08a23eb1091982daacb2122f90a7094a77
Merge branch 'uverbs_dev_cleanups' into rdma.git for-next

For dependencies, branch based on rdma.git 'for-rc' of
https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/

Pull 'uverbs_dev_cleanups' from Leon Romanovsky:

====================
Reuse the char device code interfaces to simplify ib_uverbs_device
creation and destruction. As part of this series, we are sending fix to
cleanup path, which was discovered during internal review,

The fix definitely can go to -rc, but it means that this series will be
dependent on rdma-rc.
====================

* branch 'uverbs_dev_cleanups':
  RDMA/uverbs: Use device.groups to initialize device attributes
  RDMA/uverbs: Use cdev_device_add() instead of cdev_add()
  RDMA/core: Depend on device_add() to add device attributes
  RDMA/uverbs: Fix error cleanup path of ib_uverbs_add_one()

Resolved conflict in ib_device_unregister_sysfs()

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
drivers/infiniband/core/sysfs.c
drivers/infiniband/hw/bnxt_re/qplib_fp.c
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
include/rdma/ib_verbs.h