diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-09 23:30:03 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-09 23:30:03 (GMT) |
| commit | 1fde76f173e4d9aa205432c2ed5eff978d00deee (patch) | |
| tree | ae8c0400944bffd7cc1ce9a883784f9482f7a680 /drivers/infiniband/sw/rxe/rxe_mmap.c | |
| parent | b66484cd74706fa8681d051840fe4b18a3da40ff (diff) | |
| parent | e404f945a6101a6f0f2a29aade6dc32015471daa (diff) | |
| download | linux-1fde76f173e4d9aa205432c2ed5eff978d00deee.tar.xz | |
Merge tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull more rdma updates from Doug Ledford:
"Minor updates for rxe driver"
[ Starting to do merge window pulls again - the current -git tree does
appear to have some netfilter use-after-free issues, but I've sent
off the report to the proper channels, and I don't want to delay merge
window activity any more ]
* tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
IB/rxe: improved debug prints & code cleanup
rdma_rxe: Ensure rdma_rxe init occurs at correct time
IB/rxe: Properly honor max IRD value for rd/atomic.
IB/{rxe,core,rdmavt}: Fix kernel crash for reg MR
IB/rxe: Fix sending out loopback packet on netdev interface.
IB/rxe: Avoid scheduling tasklet for userspace QP
Diffstat (limited to 'drivers/infiniband/sw/rxe/rxe_mmap.c')
| -rw-r--r-- | drivers/infiniband/sw/rxe/rxe_mmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/sw/rxe/rxe_mmap.c b/drivers/infiniband/sw/rxe/rxe_mmap.c index 54b3c7c..c572a4c 100644 --- a/drivers/infiniband/sw/rxe/rxe_mmap.c +++ b/drivers/infiniband/sw/rxe/rxe_mmap.c @@ -126,7 +126,7 @@ found_it: ret = remap_vmalloc_range(vma, ip->obj, 0); if (ret) { - pr_err("rxe: err %d from remap_vmalloc_range\n", ret); + pr_err("err %d from remap_vmalloc_range\n", ret); goto done; } |