| Message ID | 20180804084354.GA26103@infradead.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | nvme updates for 4.19 | expand |
On 8/4/18 2:43 AM, Christoph Hellwig wrote: This one: > Christoph Hellwig (9): > nvme: add ANA support Has a stupid conflict with: commit fa441b71aa27d06fa79d5e7f7c329981dccd94d1 Author: Weiping Zhang <zhangweiping@didichuxing.com> Date: Tue Jul 3 00:34:38 2018 +0800 nvme: don't enable AEN if not supported from mainline. Please keep changes like that in mind, that change should never have been in the "nvme: add ANA support" patch.
On Sat, Aug 04, 2018 at 12:39:13PM -0600, Jens Axboe wrote: > On 8/4/18 2:43 AM, Christoph Hellwig wrote: > This one: > > > Christoph Hellwig (9): > > nvme: add ANA support > > Has a stupid conflict with: > > commit fa441b71aa27d06fa79d5e7f7c329981dccd94d1 > Author: Weiping Zhang <zhangweiping@didichuxing.com> > Date: Tue Jul 3 00:34:38 2018 +0800 > > nvme: don't enable AEN if not supported > > from mainline. Please keep changes like that in mind, that change should > never have been in the "nvme: add ANA support" patch. The addition of the supported bit is because the released version of the ANA spec was buggy and didn't add the supported bit to the oaes field. This hasn't been fixed in an erratate and I dropped the manual addition of the support, but I failed to remove the local supported variable (which modulo the conflict actually makes sense, but should indeed not have been part of the commit).
On 8/5/18 1:33 AM, Christoph Hellwig wrote: > On Sat, Aug 04, 2018 at 12:39:13PM -0600, Jens Axboe wrote: >> On 8/4/18 2:43 AM, Christoph Hellwig wrote: >> This one: >> >>> Christoph Hellwig (9): >>> nvme: add ANA support >> >> Has a stupid conflict with: >> >> commit fa441b71aa27d06fa79d5e7f7c329981dccd94d1 >> Author: Weiping Zhang <zhangweiping@didichuxing.com> >> Date: Tue Jul 3 00:34:38 2018 +0800 >> >> nvme: don't enable AEN if not supported >> >> from mainline. Please keep changes like that in mind, that change should >> never have been in the "nvme: add ANA support" patch. > > The addition of the supported bit is because the released version > of the ANA spec was buggy and didn't add the supported bit to the > oaes field. This hasn't been fixed in an erratate and I dropped > the manual addition of the support, but I failed to remove the > local supported variable (which modulo the conflict actually makes > sense, but should indeed not have been part of the commit). Right, the change is fine, it's just fighting a similar change in a different branch. I did fix it up (picked in the original change first), please double check at your convenience.
On Sun, Aug 05, 2018 at 08:27:22AM -0600, Jens Axboe wrote: > Right, the change is fine, it's just fighting a similar change > in a different branch. I did fix it up (picked in the original change > first), please double check at your convenience. The merge looks good. Given that you've changed the head anyway I'd also be happy to give you a version of the ANA commit without that change..
On 8/6/18 1:31 AM, Christoph Hellwig wrote: > On Sun, Aug 05, 2018 at 08:27:22AM -0600, Jens Axboe wrote: >> Right, the change is fine, it's just fighting a similar change >> in a different branch. I did fix it up (picked in the original change >> first), please double check at your convenience. > > The merge looks good. Given that you've changed the head anyway I'd > also be happy to give you a version of the ANA commit without that > change.. Let's just leave it as-is for now, I pulled in -rc6 to ensure that I would resolve the conflict instead of introducing it to Linus.
This conatains the support for TP4004, Asymmetric Namespace Access, which makes NVMe multipathing usable in practice. The following changes since commit cdcdcaae8450a975e7d07e1bfec21f9b8c016d0c: scsi: virtio_scsi: fix pi_bytes{out,in} on 4 KiB block size devices (2018-07-26 15:49:43 -0600) are available in the Git repository at: git://git.infradead.org/nvme.git nvme-4.19 for you to fetch changes up to b369b30cf510fe94d8884837039362e2ec223cec: nvmet: use Retain Async Event bit to clear AEN (2018-07-27 19:14:31 +0200) ---------------------------------------------------------------- Chaitanya Kulkarni (1): nvmet: use Retain Async Event bit to clear AEN Christoph Hellwig (9): nvme.h: add support for the log specific field nvme.h: add ANA definitions nvme: simplify the API for getting log pages nvme: remove nvme_req_needs_failover nvme: add ANA support nvmet: keep a port pointer in nvmet_ctrl nvmet: track and limit the number of namespaces per subsystem nvmet: add minimal ANA support nvmet: support configuring ANA groups drivers/nvme/host/core.c | 77 +++++---- drivers/nvme/host/lightnvm.c | 5 +- drivers/nvme/host/multipath.c | 349 +++++++++++++++++++++++++++++++++++++--- drivers/nvme/host/nvme.h | 61 +++++-- drivers/nvme/target/admin-cmd.c | 104 +++++++++++- drivers/nvme/target/configfs.c | 190 ++++++++++++++++++++++ drivers/nvme/target/core.c | 71 +++++++- drivers/nvme/target/nvmet.h | 53 +++++- include/linux/nvme.h | 52 +++++- 9 files changed, 884 insertions(+), 78 deletions(-)