From: Jens Axboe <axboe@kernel.dk>
To: jsmart2021@gmail.com, linux-scsi@vger.kernel.org,
linux-nvme@lists.infradead.org, sagi@grimberg.me
Cc: Dick Kennedy <dick.kennedy@broadcom.com>,
James Smart <james.smart@broadcom.com>
Subject: Re: [PATCH] lpfc: fix compile error when CONFIG_NVME_TARGET_FC not enabled
Date: Thu, 27 Apr 2017 13:40:05 -0600 [thread overview]
Message-ID: <45c01ad4-5241-bb9f-1d0a-7749ae6ca5d9@kernel.dk> (raw)
In-Reply-To: <20170427193547.21553-1-jsmart2021@gmail.com>
On 04/27/2017 01:35 PM, jsmart2021@gmail.com wrote:
> From: James Smart <jsmart2021@gmail.com>
>
> fix compile error when CONFIG_NVME_TARGET_FC not enabled
>
> return statement needs to be outside of ifdef
>
> Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
> Signed-off-by: James Smart <james.smart@broadcom.com>
> ---
> Patch to be pulled in via block trees
>
> Patch cut against nvme-4.12 tree
>
>
> drivers/scsi/lpfc/lpfc_nvmet.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c
> index 90527e7..4da99db 100644
> --- a/drivers/scsi/lpfc/lpfc_nvmet.c
> +++ b/drivers/scsi/lpfc/lpfc_nvmet.c
> @@ -958,8 +958,8 @@ lpfc_nvmet_rcv_unsol_abort(struct lpfc_vport *vport,
>
> /* Respond with BA_RJT accordingly */
> lpfc_sli4_seq_abort_rsp(vport, fc_hdr, 0);
> - return 0;
> #endif
> + return 0;
> }
>
> void
>
I fixed this up already when I merged it, it's in the merge commit with
the block for-4.12/post-merge tree.
--
Jens Axboe
prev parent reply other threads:[~2017-04-27 19:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-27 19:35 [PATCH] lpfc: fix compile error when CONFIG_NVME_TARGET_FC not enabled jsmart2021
2017-04-27 19:40 ` Jens Axboe [this message]
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=45c01ad4-5241-bb9f-1d0a-7749ae6ca5d9@kernel.dk \
--to=axboe@kernel.dk \
--cc=dick.kennedy@broadcom.com \
--cc=james.smart@broadcom.com \
--cc=jsmart2021@gmail.com \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=sagi@grimberg.me \
/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