diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-23 11:27:49 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-23 11:27:49 -0800 | 
| commit | af17fe7a63db7e11d65f1296f0cbf156a89a2735 (patch) | |
| tree | 39b8c379a5a30e1468684832945eaab704f6d095 /kernel/trace/trace_uprobe.c | |
| parent | f14cc3b13d8f3ceee862f8365d37ba214630126a (diff) | |
| parent | cdbe33d0f82d68ff74f05502a4c26e65ec7e90bb (diff) | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull Mellanox rdma updates from Doug Ledford:
 "Mellanox specific updates for 4.11 merge window
  Because the Mellanox code required being based on a net-next tree, I
  keept it separate from the remainder of the RDMA stack submission that
  is based on 4.10-rc3.
  This branch contains:
   - Various mlx4 and mlx5 fixes and minor changes
   - Support for adding a tag match rule to flow specs
   - Support for cvlan offload operation for raw ethernet QPs
   - A change to the core IB code to recognize raw eth capabilities and
     enumerate them (touches non-Mellanox code)
   - Implicit On-Demand Paging memory registration support"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (40 commits)
  IB/mlx5: Fix configuration of port capabilities
  IB/mlx4: Take source GID by index from HW GID table
  IB/mlx5: Fix blue flame buffer size calculation
  IB/mlx4: Remove unused variable from function declaration
  IB: Query ports via the core instead of direct into the driver
  IB: Add protocol for USNIC
  IB/mlx4: Support raw packet protocol
  IB/mlx5: Support raw packet protocol
  IB/core: Add raw packet protocol
  IB/mlx5: Add implicit MR support
  IB/mlx5: Expose MR cache for mlx5_ib
  IB/mlx5: Add null_mkey access
  IB/umem: Indicate that process is being terminated
  IB/umem: Update on demand page (ODP) support
  IB/core: Add implicit MR flag
  IB/mlx5: Support creation of a WQ with scatter FCS offload
  IB/mlx5: Enable QP creation with cvlan offload
  IB/mlx5: Enable WQ creation and modification with cvlan offload
  IB/mlx5: Expose vlan offloads capabilities
  IB/uverbs: Enable QP creation with cvlan offload
  ...
Diffstat (limited to 'kernel/trace/trace_uprobe.c')
0 files changed, 0 insertions, 0 deletions
