diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-11 08:46:11 -1000 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-11 08:46:11 -1000 | 
| commit | 28a0ea77ba50fc8a9684b7af96ece05dfeb6f64b (patch) | |
| tree | e524d8dc70d740f120f787f8da96861fafea41ac /net/lapb/lapb_timer.c | |
| parent | 11da3a7f84f19c26da6f86af878298694ede0804 (diff) | |
| parent | 8f28b178f71cc56eccf2a6e2c0ace17c82f900d7 (diff) | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Pull rdma fixes from Jason Gunthorpe:
 "This fixes one major regression with NFS and mlx4 due to the max_sg
  rework in this merge window, tidies a few minor error_path
  regressions, and various small fixes.
  The HFI1 driver is broken this cycle due to a regression caused by a
  PCI change, it is looking like Bjorn will merge a fix for this. Also,
  the lingering ipoib issue I mentioned earlier still remains unfixed.
  Summary:
   - Fix possible FD type confusion crash
   - Fix a user trigger-able crash in cxgb4
   - Fix bad handling of IOMMU resources causing user controlled leaking
     in bnxt
   - Add missing locking in ipoib to fix a rare 'stuck tx' situation
   - Add missing locking in cma
   - Add two missing missing uverbs cleanups on failure paths,
     regressions from this merge window
   - Fix a regression from this merge window that caused RDMA NFS to not
     work with the mlx4 driver due to the max_sg changes"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  RDMA/mlx4: Ensure that maximal send/receive SGE less than supported by HW
  RDMA/cma: Protect cma dev list with lock
  RDMA/uverbs: Fix error cleanup path of ib_uverbs_add_one()
  bnxt_re: Fix couple of memory leaks that could lead to IOMMU call traces
  IB/ipoib: Avoid a race condition between start_xmit and cm_rep_handler
  iw_cxgb4: only allow 1 flush on user qps
  IB/core: Release object lock if destroy failed
  RDMA/ucma: check fd type in ucma_migrate_id()
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions
