Hi Doug,
Today's linux-next merge of the rdma tree got conflicts in:
drivers/staging/rdma/hfi1/keys.c
drivers/staging/rdma/hfi1/mr.c
between commits:
809487c70388 ("staging: rdma: hfi1: Use DIV_ROUND_UP")
037f741673e0 ("staging: rdma: hfi1: Do not use | with a variable with value 0")
from Linus' tree and commit:
895420ddc8b3 ("staging/rdma/hfi1: Remove hfi1 MR and hfi1 specific qp type")
from the rdma tree.
I fixed it up (I just removed the 2 files - the changes from Linus'
tree may need to be applied to some other files, now) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging. You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
