]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/ofed.rds-p2' into topic/uek-4.1/ofed
authorMukesh Kacker <mukesh.kacker@oracle.com>
Thu, 17 Sep 2015 00:08:31 +0000 (17:08 -0700)
committerMukesh Kacker <mukesh.kacker@oracle.com>
Thu, 17 Sep 2015 00:08:31 +0000 (17:08 -0700)
* topic/uek-4.1/ofed.rds-p2:
  RDS: change spin_lock to spin_lock_bh
  rds: add busy_list only when fmr allocated successfully
  rds: free ib_device related resource
  rds: srq initialization and cleanup

1  2 
net/rds/ib.c

diff --cc net/rds/ib.c
Simple merge