From: Christoph Hellwig <hch@infradead.org>
To: Sagi Grimberg <sagi@grimberg.me>
Cc: jsmart2021@gmail.com, linux-scsi@vger.kernel.org,
linux-nvme@lists.infradead.org, martin.petersen@oracle.com
Subject: Re: ["PATCH-v2" 00/22] lpfc updates for 11.2.0.12
Date: Thu, 20 Apr 2017 23:22:58 -0700 [thread overview]
Message-ID: <20170421062258.GA30237@infradead.org> (raw)
In-Reply-To: <a8ba07f3-348e-4ae4-010b-1c9ff63b6f0d@grimberg.me>
On Fri, Apr 21, 2017 at 02:52:13AM +0300, Sagi Grimberg wrote:
>
> > The patches are dependent on the FC nvme/nvmet patches from the following 2
> > series:
> > http://lists.infradead.org/pipermail/linux-nvme/2017-April/009250.html
> > http://lists.infradead.org/pipermail/linux-nvme/2017-April/009256.html
>
> Hmm,
>
> So it seems that we have conflicts here
>
> A local merge attempt on Jens's current for-4.12/block
> from nvme-4.12 (with this patchset)is generating:
The problem are two patches from the "nvme_fc: add ctlr reset support
and abort fixes" series from James which conflict badly with the NVMe
result/state rework in block/for-next.
I will drop this series from nvme-4.12 for now, and rebase nvme-4.12
on top of Jens' for-4.12 tree so that we have a good base to start
from. I think we can get James' patch in post-rc1 or wih a second
pull request still.
Also James once you do that please run the patches through sparse,
there are a few warnings in the changes, although they mostly seem
to replace old warnings with different ones.
next prev parent reply other threads:[~2017-04-21 6:23 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-20 22:04 ["PATCH-v2" 00/22] lpfc updates for 11.2.0.12 jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 01/22] Standardize nvme SGL segment count jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 02/22] Fix nvme unregister port timeout jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 03/22] Fix rejected nvme LS Req jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 04/22] Fix log message in completion path jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 05/22] Add debug messages for nvme/fcp resource allocation jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 06/22] Fix spelling in comments jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 07/22] Remove unused defines for NVME PostBuf jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 08/22] Remove NULL ptr check before kfree jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 09/22] Fix extra line print in rqpair debug print jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 10/22] Fix PRLI ACC rsp for NVME jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 11/22] Fix driver unload/reload operation jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 12/22] Fix driver usage of 128B WQEs when WQ_CREATE is V1 jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 13/22] Fix nvme initiator handling when not enabled jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 14/22] Remove hba lock from NVMET issue WQE jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 15/22] Fix driver load issues when MRQ=8 jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 16/22] Fix crash after issuing lip reset jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 17/22] Fix max_sgl_segments settings for NVME / NVMET jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 18/22] Add Fabric assigned WWN support jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 19/22] Fix implicit logo and RSCN handling for NVMET jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 20/22] Update ABORT processing " jsmart2021
2017-04-21 7:07 ` Johannes Thumshirn
2017-04-20 22:04 ` ["PATCH-v2" 21/22] Fix Express lane queue creation jsmart2021
2017-04-20 22:04 ` ["PATCH-v2" 22/22] lpfc revison 11.2.0.12 jsmart2021
2017-04-20 23:52 ` ["PATCH-v2" 00/22] lpfc updates for 11.2.0.12 Sagi Grimberg
2017-04-21 6:22 ` Christoph Hellwig [this message]
2017-04-21 14:24 ` Martin K. Petersen
2017-04-21 17:13 ` James Smart
2017-04-21 16:44 ` James Smart
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=20170421062258.GA30237@infradead.org \
--to=hch@infradead.org \
--cc=jsmart2021@gmail.com \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--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