On Wed, 2010-06-09 at 14:59 -0700, Nicholas A. Bellinger wrote: > Greetings Joe, > > While doing a pull recently for v2.6.35-rc2, I ran into a merge conflict > below in drivers/scsi/libfc/fc_rport.c:fc_rport_recv_pril_req() > with the original PLOGI driven target provider hooks changes that I have > been including into the lio-core-2.6.git tree for tcm_fc. > > >From taking a quick look, I assume that active and passing prov->prli() > calls need to appear under the new roles assignment, namely under: > > if (fcp_parm & FCP_SPPF_TARG_FCN) > roles |= FC_RPORT_ROLE_FCP_TARGET; > > for the upstream e44a21b726 commit. Is there anything else that should > be taken into consideration to get this running again..? > FYI, there are a bunch of rport related patches in my fcoe-next tree that I'll mail to linux-scsi soon. You might want to pull them or just be aware that they're coming. I'm not sure if they'll cause conflicts with your patches or not. //Rob -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
