Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mthca: Fix data corruption after FMR unmap on Sinai

drivers/infiniband/hw/mthca/mthca_mr.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -835,6 +835,7 @@ void mthca_arbel_fmr_unmap(struct mthca_dev dev, struct mthca_fmr fmr)

		key = arbel_key_to_hw_index(fmr->ibmr.lkey);
		key &= dev->limits.num_mpts - 1;
		key = adjust_key(dev, key);
		fmr->ibmr.lkey = fmr->ibmr.rkey = arbel_hw_index_to_key(key);

		fmr->maps = 0;