public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
From: Robert Love <robert.w.love@intel.com>
To: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
Cc: Joe Eykholt <jeykholt@cisco.com>,
	openfcoe-devel <devel@open-fcoe.org>,
	linux-scsi <linux-scsi@vger.kernel.org>
Subject: Re: [Open-FCoE] libfc fc_rport_recv_prli_req() changes for v2.6.35-rc2
Date: Wed, 09 Jun 2010 15:12:23 -0700	[thread overview]
Message-ID: <1276121543.1431.4.camel@fritz> (raw)
In-Reply-To: <1276120786.18353.89.camel@haakon2.linux-iscsi.org>

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


  reply	other threads:[~2010-06-09 22:12 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-09 21:59 libfc fc_rport_recv_prli_req() changes for v2.6.35-rc2 Nicholas A. Bellinger
2010-06-09 22:12 ` Robert Love [this message]
2010-06-09 22:21   ` [Open-FCoE] " Nicholas A. Bellinger
2010-06-09 22:23 ` Joe Eykholt
2010-06-09 22:28   ` Nicholas A. Bellinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1276121543.1431.4.camel@fritz \
    --to=robert.w.love@intel.com \
    --cc=devel@open-fcoe.org \
    --cc=jeykholt@cisco.com \
    --cc=linux-scsi@vger.kernel.org \
    --cc=nab@linux-iscsi.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox