[ofa-general] linux-next: manual merge of the infiniband tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
include/linux/mlx4/qp.h between commit
95d04f0735b4fc837bff9aedcc3f3efb20ddc3d1 ("IB/mlx4: Add support for
memory management extensions and local DMA L_Key") from Linus' tree and
commit 5fcbaab14db959eb6feecae57387cfff364f11b3 ("IB/mlx4: Add support
for memory management extensions and local DMA L_Key") from the
infiniband tree.

Please don't submit patches to Linus that are different to those you have
in linux-next.

I used the version in Linus' tree.
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/general/attachments/20080725/f336c4c5/attachment.sig>