linux-next: manual merge of the rdma tree with Linus' tree
From: Stephen Rothwell
Date: Sun Oct 09 2016 - 20:54:08 EST
Today's linux-next merge of the rdma tree got a conflict in:
0fbc81b3ad51 ("chcr/cxgb4i/cxgbit/RDMA/cxgb4: Allocate resources dynamically for all cxgb4 ULD's")
from Linus' tree and commit:
086de575c142 ("cxgb4: advertise support for FR_NSMR_TPTE_WR")
from the rdma tree.
I fixed it up (the former removed the code modified by the latter) 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.